[webkit-changes] [158623] trunk/Source/WebCore
Title: [158623] trunk/Source/WebCore Revision 158623 Author par...@webkit.org Date 2013-11-04 17:31:43 -0800 (Mon, 04 Nov 2013) Log Message Remove code duplications in createFontCustomPlatformData() https://bugs.webkit.org/show_bug.cgi?id=123706 Reviewed by Darin Adler. Move OpenTypeSanitizer and WOFF handling from the port specific implementations in createFontCustomPlatformData() into the only caller of this function CachedFont::ensureCustomFontData(). Also change the parameter passing the SharedBuffer from a pointer to a reference since it is never null. * loader/cache/CachedFont.cpp: (WebCore::CachedFont::ensureCustomFontData): * platform/graphics/blackberry/FontCustomPlatformData.h: * platform/graphics/blackberry/FontCustomPlatformDataBlackBerry.cpp: (WebCore::FontCustomPlatformData::FontCustomPlatformData): (WebCore::createFontCustomPlatformData): * platform/graphics/cairo/FontCustomPlatformData.h: * platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp: (WebCore::FontCustomPlatformData::FontCustomPlatformData): (WebCore::createFontCustomPlatformData): * platform/graphics/mac/FontCustomPlatformData.cpp: (WebCore::createFontCustomPlatformData): * platform/graphics/mac/FontCustomPlatformData.h: * platform/graphics/win/FontCustomPlatformData.cpp: (WebCore::createFontCustomPlatformData): * platform/graphics/win/FontCustomPlatformData.h: * platform/graphics/win/FontCustomPlatformDataCairo.cpp: (WebCore::createFontCustomPlatformData): * platform/graphics/wince/FontCustomPlatformData.cpp: (WebCore::createFontCustomPlatformData): * platform/graphics/wince/FontCustomPlatformData.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/loader/cache/CachedFont.cpp trunk/Source/WebCore/platform/graphics/blackberry/FontCustomPlatformData.h trunk/Source/WebCore/platform/graphics/blackberry/FontCustomPlatformDataBlackBerry.cpp trunk/Source/WebCore/platform/graphics/cairo/FontCustomPlatformData.h trunk/Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformData.h trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp trunk/Source/WebCore/platform/graphics/wince/FontCustomPlatformData.cpp trunk/Source/WebCore/platform/graphics/wince/FontCustomPlatformData.h Diff Modified: trunk/Source/WebCore/ChangeLog (158622 => 158623) --- trunk/Source/WebCore/ChangeLog 2013-11-05 01:31:41 UTC (rev 158622) +++ trunk/Source/WebCore/ChangeLog 2013-11-05 01:31:43 UTC (rev 158623) @@ -1,3 +1,38 @@ +2013-11-04 Patrick Gansterer + +Remove code duplications in createFontCustomPlatformData() +https://bugs.webkit.org/show_bug.cgi?id=123706 + +Reviewed by Darin Adler. + +Move OpenTypeSanitizer and WOFF handling from the port specific +implementations in createFontCustomPlatformData() into the only +caller of this function CachedFont::ensureCustomFontData(). +Also change the parameter passing the SharedBuffer from a +pointer to a reference since it is never null. + +* loader/cache/CachedFont.cpp: +(WebCore::CachedFont::ensureCustomFontData): +* platform/graphics/blackberry/FontCustomPlatformData.h: +* platform/graphics/blackberry/FontCustomPlatformDataBlackBerry.cpp: +(WebCore::FontCustomPlatformData::FontCustomPlatformData): +(WebCore::createFontCustomPlatformData): +* platform/graphics/cairo/FontCustomPlatformData.h: +* platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp: +(WebCore::FontCustomPlatformData::FontCustomPlatformData): +(WebCore::createFontCustomPlatformData): +* platform/graphics/mac/FontCustomPlatformData.cpp: +(WebCore::createFontCustomPlatformData): +* platform/graphics/mac/FontCustomPlatformData.h: +* platform/graphics/win/FontCustomPlatformData.cpp: +(WebCore::createFontCustomPlatformData): +* platform/graphics/win/FontCustomPlatformData.h: +* platform/graphics/win/FontCustomPlatformDataCairo.cpp: +(WebCore::createFontCustomPlatformData): +* platform/graphics/wince/FontCustomPlatformData.cpp: +(WebCore::createFontCustomPlatformData): +* platform/graphics/wince/FontCustomPlatformData.h: + 2013-11-04 Thiago de Barros Lacerda Fixing MediaStreamDescriptor addSource and addTrack methods Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (158622 => 158623) --- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2013-11-05 01:31:41 UTC (rev 158622) +++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2013-11-05 01:31:43 UTC (rev 158623) @@ -33,8 +33,11 @@ #include "FontCustomPlatformData.h" #include "FontPlatformData.h
[webkit-changes] [158534] trunk/Tools
Title: [158534] trunk/Tools
Revision 158534
Author par...@webkit.org
Date 2013-11-03 09:51:21 -0800 (Sun, 03 Nov 2013)
Log Message
Add test for ListHashSet::removeLast()
https://bugs.webkit.org/show_bug.cgi?id=121810
Reviewed by Anders Carlsson.
* TestWebKitAPI/Tests/WTF/ListHashSet.cpp:
(TestWebKitAPI::TEST):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp
Diff
Modified: trunk/Tools/ChangeLog (158533 => 158534)
--- trunk/Tools/ChangeLog 2013-11-03 17:48:56 UTC (rev 158533)
+++ trunk/Tools/ChangeLog 2013-11-03 17:51:21 UTC (rev 158534)
@@ -1,3 +1,13 @@
+2013-11-03 Patrick Gansterer
+
+Add test for ListHashSet::removeLast()
+https://bugs.webkit.org/show_bug.cgi?id=121810
+
+Reviewed by Anders Carlsson.
+
+* TestWebKitAPI/Tests/WTF/ListHashSet.cpp:
+(TestWebKitAPI::TEST):
+
2013-11-02 Filip Pizlo
LLVM assertion failures should funnel into WTF's crash handling
Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp (158533 => 158534)
--- trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp 2013-11-03 17:48:56 UTC (rev 158533)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp 2013-11-03 17:51:21 UTC (rev 158534)
@@ -49,6 +49,25 @@
ASSERT_TRUE(list.isEmpty());
}
+TEST(WTF_ListHashSet, RemoveLast)
+{
+ListHashSet list;
+list.add(1);
+list.add(2);
+list.add(3);
+
+ASSERT_EQ(3, list.last());
+
+list.removeLast();
+ASSERT_EQ(2, list.last());
+
+list.removeLast();
+ASSERT_EQ(1, list.last());
+
+list.removeLast();
+ASSERT_TRUE(list.isEmpty());
+}
+
TEST(WTF_ListHashSet, AppendOrMoveToLastNewItems)
{
ListHashSet list;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [158533] trunk/Source
Title: [158533] trunk/Source
Revision 158533
Author par...@webkit.org
Date 2013-11-03 09:48:56 -0800 (Sun, 03 Nov 2013)
Log Message
[WINCE] Replace OwnPtr with GDIObject
https://bugs.webkit.org/show_bug.cgi?id=123670
Reviewed by Anders Carlsson.
Source/WebCore:
* page/win/FrameGdiWin.cpp:
(WebCore::imageFromRect):
* platform/graphics/wince/FontPlatformData.cpp:
(WebCore::FixedSizeFontData::create):
(WebCore::FontPlatformData::hfont):
(WebCore::FontPlatformData::getScaledFontHandle):
* platform/graphics/wince/GraphicsContextWinCE.cpp:
(WebCore::createPen):
(WebCore::createBrush):
(WebCore::GraphicsContext::drawRect):
(WebCore::GraphicsContext::drawLine):
(WebCore::GraphicsContext::drawEllipse):
(WebCore::GraphicsContext::drawConvexPolygon):
(WebCore::GraphicsContext::fillRect):
(WebCore::GraphicsContext::clip):
(WebCore::GraphicsContext::strokeRect):
(WebCore::GraphicsContext::fillRoundedRect):
(WebCore::GraphicsContext::drawRoundCorner):
(WebCore::GraphicsContext::fillPath):
(WebCore::GraphicsContext::strokePath):
(WebCore::GraphicsContext::drawText):
* platform/graphics/wince/ImageWinCE.cpp:
(WebCore::BitmapImage::getHBITMAPOfSize):
* platform/graphics/wince/SharedBitmap.cpp:
(WebCore::SharedBitmap::createHandle):
(WebCore::SharedBitmap::draw):
(WebCore::SharedBitmap::clipBitmap):
(WebCore::drawPatternSimple):
(WebCore::SharedBitmap::drawPattern):
(WebCore::SharedBitmap::DCProvider::getDC):
* platform/graphics/wince/SharedBitmap.h:
Source/WebKit/wince:
* WebView.cpp:
(WebView::paint):
(WebView::handlePaint):
* WebView.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/win/FrameGdiWin.cpp
trunk/Source/WebCore/platform/graphics/wince/FontPlatformData.cpp
trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
trunk/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp
trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.cpp
trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.h
trunk/Source/WebKit/wince/ChangeLog
trunk/Source/WebKit/wince/WebView.cpp
trunk/Source/WebKit/wince/WebView.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (158532 => 158533)
--- trunk/Source/WebCore/ChangeLog 2013-11-03 14:55:47 UTC (rev 158532)
+++ trunk/Source/WebCore/ChangeLog 2013-11-03 17:48:56 UTC (rev 158533)
@@ -1,3 +1,42 @@
+2013-11-03 Patrick Gansterer
+
+[WINCE] Replace OwnPtr with GDIObject
+https://bugs.webkit.org/show_bug.cgi?id=123670
+
+Reviewed by Anders Carlsson.
+
+* page/win/FrameGdiWin.cpp:
+(WebCore::imageFromRect):
+* platform/graphics/wince/FontPlatformData.cpp:
+(WebCore::FixedSizeFontData::create):
+(WebCore::FontPlatformData::hfont):
+(WebCore::FontPlatformData::getScaledFontHandle):
+* platform/graphics/wince/GraphicsContextWinCE.cpp:
+(WebCore::createPen):
+(WebCore::createBrush):
+(WebCore::GraphicsContext::drawRect):
+(WebCore::GraphicsContext::drawLine):
+(WebCore::GraphicsContext::drawEllipse):
+(WebCore::GraphicsContext::drawConvexPolygon):
+(WebCore::GraphicsContext::fillRect):
+(WebCore::GraphicsContext::clip):
+(WebCore::GraphicsContext::strokeRect):
+(WebCore::GraphicsContext::fillRoundedRect):
+(WebCore::GraphicsContext::drawRoundCorner):
+(WebCore::GraphicsContext::fillPath):
+(WebCore::GraphicsContext::strokePath):
+(WebCore::GraphicsContext::drawText):
+* platform/graphics/wince/ImageWinCE.cpp:
+(WebCore::BitmapImage::getHBITMAPOfSize):
+* platform/graphics/wince/SharedBitmap.cpp:
+(WebCore::SharedBitmap::createHandle):
+(WebCore::SharedBitmap::draw):
+(WebCore::SharedBitmap::clipBitmap):
+(WebCore::drawPatternSimple):
+(WebCore::SharedBitmap::drawPattern):
+(WebCore::SharedBitmap::DCProvider::getDC):
+* platform/graphics/wince/SharedBitmap.h:
+
2013-11-03 Antti Koivisto
Add helpers for partial descendant traversal to element iterators
Modified: trunk/Source/WebCore/page/win/FrameGdiWin.cpp (158532 => 158533)
--- trunk/Source/WebCore/page/win/FrameGdiWin.cpp 2013-11-03 14:55:47 UTC (rev 158532)
+++ trunk/Source/WebCore/page/win/FrameGdiWin.cpp 2013-11-03 17:48:56 UTC (rev 158533)
@@ -30,13 +30,13 @@
#include "Frame.h"
#include "FrameView.h"
#include "GraphicsContext.h"
-#include
+#include
namespace WebCore {
extern HDC g_screenDC;
-PassOwnPtr imageFromRect(Frame* frame, IntRect& ir)
+GDIObject imageFromRect(Frame* frame, IntRect& ir)
{
int w;
int h;
@@ -51,21 +51,21 @@
h = ir.height();
}
-OwnPtr bmpDC = adoptPtr(CreateCompatibleDC(g_screenDC));
-OwnPtr hBmp = adoptPtr(CreateCompatibleBitmap(g_screenDC, w, h));
+auto bmpDC = adoptGDIObject(::CreateCompatibleDC(g_screenDC));
+auto hBmp = adoptGDIObject(::CreateCompatibleBitmap(g_screenDC, w, h));
if (!hBmp)
return nul
[webkit-changes] [158519] trunk/Source/WebCore
Title: [158519] trunk/Source/WebCore
Revision 158519
Author par...@webkit.org
Date 2013-11-02 20:24:47 -0700 (Sat, 02 Nov 2013)
Log Message
Cleanup OpenTypeUtilities
https://bugs.webkit.org/show_bug.cgi?id=123686
Reviewed by Darin Adler.
Merge the WinCE specific code into the general Windows code to
make the compilation of WinCE port on WinNT easier.
* platform/graphics/opentype/OpenTypeUtilities.cpp:
(WebCore::renameFont):
(WebCore::renameAndActivateFont):
* platform/graphics/opentype/OpenTypeUtilities.h:
* platform/graphics/win/FontCustomPlatformData.cpp:
(WebCore::createFontCustomPlatformData):
* platform/graphics/win/FontCustomPlatformDataCairo.cpp:
(WebCore::createFontCustomPlatformData):
* platform/graphics/wince/FontCustomPlatformData.cpp:
(WebCore::createFontCustomPlatformData):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp
trunk/Source/WebCore/platform/graphics/opentype/OpenTypeUtilities.h
trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp
trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp
trunk/Source/WebCore/platform/graphics/wince/FontCustomPlatformData.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (158518 => 158519)
--- trunk/Source/WebCore/ChangeLog 2013-11-03 03:19:32 UTC (rev 158518)
+++ trunk/Source/WebCore/ChangeLog 2013-11-03 03:24:47 UTC (rev 158519)
@@ -1,3 +1,24 @@
+2013-11-02 Patrick Gansterer
+
+Cleanup OpenTypeUtilities
+https://bugs.webkit.org/show_bug.cgi?id=123686
+
+Reviewed by Darin Adler.
+
+Merge the WinCE specific code into the general Windows code to
+make the compilation of WinCE port on WinNT easier.
+
+* platform/graphics/opentype/OpenTypeUtilities.cpp:
+(WebCore::renameFont):
+(WebCore::renameAndActivateFont):
+* platform/graphics/opentype/OpenTypeUtilities.h:
+* platform/graphics/win/FontCustomPlatformData.cpp:
+(WebCore::createFontCustomPlatformData):
+* platform/graphics/win/FontCustomPlatformDataCairo.cpp:
+(WebCore::createFontCustomPlatformData):
+* platform/graphics/wince/FontCustomPlatformData.cpp:
+(WebCore::createFontCustomPlatformData):
+
2013-11-02 Andreas Kling
CSSFontFaceSrcValue constructors should return PassRef.
Modified: trunk/Source/WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp (158518 => 158519)
--- trunk/Source/WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp 2013-11-03 03:19:32 UTC (rev 158518)
+++ trunk/Source/WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp 2013-11-03 03:24:47 UTC (rev 158519)
@@ -340,30 +340,37 @@
return true;
}
-// code shared by renameFont and renameAndActivateFont
// adds fontName to the font table in fontData, and writes the new font table to rewrittenFontTable
// returns the size of the name table (which is used by renameAndActivateFont), or 0 on early abort
-static size_t renameFontInternal(SharedBuffer* fontData, const String& fontName, Vector &rewrittenFontData)
+bool renameFont(const SharedBuffer& fontData, const String& fontName, Vector& rewrittenFontData)
{
-size_t originalDataSize = fontData->size();
-const sfntHeader* sfnt = reinterpret_cast(fontData->data());
+size_t originalDataSize = fontData.size();
+const sfntHeader* sfnt = reinterpret_cast(fontData.data());
+// Abort if the data is too small to be a font header with a "tables" entry.
+if (originalDataSize < offsetof(sfntHeader, tables))
+return false;
+
+// Abort if the data is too small to hold all the tables specified in the header.
+if (originalDataSize < offsetof(sfntHeader, tables) + sfnt->numTables * sizeof(TableDirectoryEntry))
+return false;
+
unsigned t;
for (t = 0; t < sfnt->numTables; ++t) {
if (sfnt->tables[t].tag == 'name')
break;
}
if (t == sfnt->numTables)
-return 0;
+return false;
const int nameRecordCount = 5;
// Rounded up to a multiple of 4 to simplify the checksum calculation.
size_t nameTableSize = ((offsetof(nameTable, nameRecords) + nameRecordCount * sizeof(nameRecord) + fontName.length() * sizeof(UChar)) & ~3) + 4;
-rewrittenFontData.resize(fontData->size() + nameTableSize);
+rewrittenFontData.resize(fontData.size() + nameTableSize);
char* data = ""
-memcpy(data, fontData->data(), originalDataSize);
+memcpy(data, fontData.data(), originalDataSize);
// Make the table directory entry point to the new 'name' table.
sfntHeader* rewrittenSfnt = reinterpret_cast(data);
@@ -398,42 +405,19 @@
for (unsigned i = 0; i * sizeof(BigEndianULong) < nameTableSize; ++i)
rewrittenSfnt->tables[t].checkSum = rewrittenSfnt->tables[t].checkSum + reinterpret_cast(name)[i];
-return nameTableSize;
-}
-
-#if OS(WINCE)
-// AddFontMemResourceEx does not exist on WinCE, so we
[webkit-changes] [158520] trunk/Source/WTF
Title: [158520] trunk/Source/WTF
Revision 158520
Author par...@webkit.org
Date 2013-11-02 20:25:06 -0700 (Sat, 02 Nov 2013)
Log Message
Fix compilation of DateMath.cpp with MSVC
https://bugs.webkit.org/show_bug.cgi?id=123680
Reviewed by Darin Adler.
* wtf/DateMath.cpp:
(WTF::appendTwoDigitNumber): Help the compiler finding the
correct overload by casting the characters to LChar.
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/DateMath.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (158519 => 158520)
--- trunk/Source/WTF/ChangeLog 2013-11-03 03:24:47 UTC (rev 158519)
+++ trunk/Source/WTF/ChangeLog 2013-11-03 03:25:06 UTC (rev 158520)
@@ -1,3 +1,14 @@
+2013-11-02 Patrick Gansterer
+
+Fix compilation of DateMath.cpp with MSVC
+https://bugs.webkit.org/show_bug.cgi?id=123680
+
+Reviewed by Darin Adler.
+
+* wtf/DateMath.cpp:
+(WTF::appendTwoDigitNumber): Help the compiler finding the
+correct overload by casting the characters to LChar.
+
2013-11-02 Filip Pizlo
LLVM assertion failures should funnel into WTF's crash handling
Modified: trunk/Source/WTF/wtf/DateMath.cpp (158519 => 158520)
--- trunk/Source/WTF/wtf/DateMath.cpp 2013-11-03 03:24:47 UTC (rev 158519)
+++ trunk/Source/WTF/wtf/DateMath.cpp 2013-11-03 03:25:06 UTC (rev 158520)
@@ -183,8 +183,8 @@
{
ASSERT(number >= 0);
ASSERT(number < 100);
-builder.append('0' + number / 10);
-builder.append('0' + number % 10);
+builder.append(static_cast('0' + number / 10));
+builder.append(static_cast('0' + number % 10));
}
int msToYear(double ms)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [158518] trunk/Source/JavaScriptCore
Title: [158518] trunk/Source/_javascript_Core
Revision 158518
Author par...@webkit.org
Date 2013-11-02 20:19:32 -0700 (Sat, 02 Nov 2013)
Log Message
Add missing getHostCallReturnValue() for MSVC ARM
https://bugs.webkit.org/show_bug.cgi?id=123685
Reviewed by Darin Adler.
* jit/JITStubsARM.h:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/jit/JITStubsARM.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (158517 => 158518)
--- trunk/Source/_javascript_Core/ChangeLog 2013-11-03 03:18:08 UTC (rev 158517)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-11-03 03:19:32 UTC (rev 158518)
@@ -1,5 +1,14 @@
2013-11-02 Patrick Gansterer
+Add missing getHostCallReturnValue() for MSVC ARM
+https://bugs.webkit.org/show_bug.cgi?id=123685
+
+Reviewed by Darin Adler.
+
+* jit/JITStubsARM.h:
+
+2013-11-02 Patrick Gansterer
+
Fix MSVC warning about unary minus operator
https://bugs.webkit.org/show_bug.cgi?id=123674
Modified: trunk/Source/_javascript_Core/jit/JITStubsARM.h (158517 => 158518)
--- trunk/Source/_javascript_Core/jit/JITStubsARM.h 2013-11-03 03:18:08 UTC (rev 158517)
+++ trunk/Source/_javascript_Core/jit/JITStubsARM.h 2013-11-03 03:19:32 UTC (rev 158518)
@@ -414,6 +414,8 @@
MSVC_BEGIN(EXPORT ctiTrampoline)
MSVC_BEGIN(EXPORT ctiTrampolineEnd)
MSVC_BEGIN(EXPORT ctiOpThrowNotCaught)
+MSVC_BEGIN(EXPORT getHostCallReturnValue)
+MSVC_BEGIN(IMPORT getHostCallReturnValueWithExecState)
MSVC_BEGIN()
MSVC_BEGIN(ctiTrampoline PROC)
MSVC_BEGIN(stmdb sp!, {r1-r3})
@@ -437,6 +439,12 @@
MSVC_BEGIN(bx lr)
MSVC_BEGIN(ctiOpThrowNotCaught ENDP)
MSVC_BEGIN()
+MSVC_BEGIN(getHostCallReturnValue PROC)
+MSVC_BEGIN(ldr r5, [r5, #40])
+MSVC_BEGIN(mov r0, r5)
+MSVC_BEGIN(b getHostCallReturnValueWithExecState)
+MSVC_BEGIN(getHostCallReturnValue ENDP)
+MSVC_BEGIN()
MSVC(EXPORT cti_#op#)
MSVC(IMPORT JITStubThunked_#op#)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [158516] trunk/Source/JavaScriptCore
Title: [158516] trunk/Source/_javascript_Core
Revision 158516
Author par...@webkit.org
Date 2013-11-02 20:16:59 -0700 (Sat, 02 Nov 2013)
Log Message
Fix MSVC warning about unary minus operator
https://bugs.webkit.org/show_bug.cgi?id=123674
Reviewed by Darin Adler.
Change some static_cast<> to silence the following warning of Microsoft compiler:
warning C4146: unary minus operator applied to unsigned type, result still unsigned
* jit/Repatch.cpp:
(JSC::emitPutTransitionStub):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/jit/Repatch.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (158515 => 158516)
--- trunk/Source/_javascript_Core/ChangeLog 2013-11-03 02:36:07 UTC (rev 158515)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-11-03 03:16:59 UTC (rev 158516)
@@ -1,3 +1,16 @@
+2013-11-02 Patrick Gansterer
+
+Fix MSVC warning about unary minus operator
+https://bugs.webkit.org/show_bug.cgi?id=123674
+
+Reviewed by Darin Adler.
+
+Change some static_cast<> to silence the following warning of Microsoft compiler:
+warning C4146: unary minus operator applied to unsigned type, result still unsigned
+
+* jit/Repatch.cpp:
+(JSC::emitPutTransitionStub):
+
2013-11-02 Filip Pizlo
Disable LLVM's pretty stack traces, which involve intercepting fatal signals
Modified: trunk/Source/_javascript_Core/jit/Repatch.cpp (158515 => 158516)
--- trunk/Source/_javascript_Core/jit/Repatch.cpp 2013-11-03 02:36:07 UTC (rev 158515)
+++ trunk/Source/_javascript_Core/jit/Repatch.cpp 2013-11-03 03:16:59 UTC (rev 158516)
@@ -859,9 +859,9 @@
stubJit.addPtr(MacroAssembler::AbsoluteAddress(&copiedAllocator->m_currentPayloadEnd), scratchGPR1);
stubJit.addPtr(MacroAssembler::TrustedImm32(sizeof(JSValue)), scratchGPR1);
// We have scratchGPR1 = new storage, scratchGPR3 = old storage, scratchGPR2 = available
-for (ptrdiff_t offset = 0; offset < static_cast(oldSize); offset += sizeof(void*)) {
-stubJit.loadPtr(MacroAssembler::Address(scratchGPR3, -(offset + sizeof(JSValue) + sizeof(void*))), scratchGPR2);
-stubJit.storePtr(scratchGPR2, MacroAssembler::Address(scratchGPR1, -(offset + sizeof(JSValue) + sizeof(void*;
+for (size_t offset = 0; offset < oldSize; offset += sizeof(void*)) {
+stubJit.loadPtr(MacroAssembler::Address(scratchGPR3, -static_cast(offset + sizeof(JSValue) + sizeof(void*))), scratchGPR2);
+stubJit.storePtr(scratchGPR2, MacroAssembler::Address(scratchGPR1, -static_cast(offset + sizeof(JSValue) + sizeof(void*;
}
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [158504] trunk/Source/WebCore
Title: [158504] trunk/Source/WebCore Revision 158504 Author par...@webkit.org Date 2013-11-02 15:17:03 -0700 (Sat, 02 Nov 2013) Log Message Fix compilation of SynchronousLoaderClient https://bugs.webkit.org/show_bug.cgi?id=123676 Reviewed by Darin Adler. Assign a ResourceRequest varibale an empty ResourceRequest instead of 0. The current solution only works for ports which can create a ResourceRequest from a pointer, which might not be true for all ports. * platform/network/SynchronousLoaderClient.cpp: (WebCore::SynchronousLoaderClient::willSendRequest): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/network/SynchronousLoaderClient.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (158503 => 158504) --- trunk/Source/WebCore/ChangeLog 2013-11-02 21:59:57 UTC (rev 158503) +++ trunk/Source/WebCore/ChangeLog 2013-11-02 22:17:03 UTC (rev 158504) @@ -1,5 +1,19 @@ 2013-11-02 Patrick Gansterer +Fix compilation of SynchronousLoaderClient +https://bugs.webkit.org/show_bug.cgi?id=123676 + +Reviewed by Darin Adler. + +Assign a ResourceRequest varibale an empty ResourceRequest instead of 0. +The current solution only works for ports which can create a +ResourceRequest from a pointer, which might not be true for all ports. + +* platform/network/SynchronousLoaderClient.cpp: +(WebCore::SynchronousLoaderClient::willSendRequest): + +2013-11-02 Patrick Gansterer + Port LoggingWin.cpp to WinCE https://bugs.webkit.org/show_bug.cgi?id=123678 Modified: trunk/Source/WebCore/platform/network/SynchronousLoaderClient.cpp (158503 => 158504) --- trunk/Source/WebCore/platform/network/SynchronousLoaderClient.cpp 2013-11-02 21:59:57 UTC (rev 158503) +++ trunk/Source/WebCore/platform/network/SynchronousLoaderClient.cpp 2013-11-02 22:17:03 UTC (rev 158504) @@ -45,7 +45,7 @@ ASSERT(m_error.isNull()); m_error = platformBadResponseError(); m_isDone = true; -request = 0; +request = ResourceRequest(); } bool SynchronousLoaderClient::shouldUseCredentialStorage(ResourceHandle*) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [158503] trunk
Title: [158503] trunk Revision 158503 Author par...@webkit.org Date 2013-11-02 14:59:57 -0700 (Sat, 02 Nov 2013) Log Message [WINCE] Disable export macros https://bugs.webkit.org/show_bug.cgi?id=123679 Reviewed by Darin Adler. Avoid useless exports by turning of the export macros since the WinCE port works as a static library only. * Source/cmake/OptionsWinCE.cmake: Modified Paths trunk/ChangeLog trunk/Source/cmake/OptionsWinCE.cmake Diff Modified: trunk/ChangeLog (158502 => 158503) --- trunk/ChangeLog 2013-11-02 21:58:59 UTC (rev 158502) +++ trunk/ChangeLog 2013-11-02 21:59:57 UTC (rev 158503) @@ -1,3 +1,15 @@ +2013-11-02 Patrick Gansterer + +[WINCE] Disable export macros +https://bugs.webkit.org/show_bug.cgi?id=123679 + +Reviewed by Darin Adler. + +Avoid useless exports by turning of the export macros +since the WinCE port works as a static library only. + +* Source/cmake/OptionsWinCE.cmake: + 2013-10-31 Ryuan Choi [EFL][GLES] OpenGL should be an optional Modified: trunk/Source/cmake/OptionsWinCE.cmake (158502 => 158503) --- trunk/Source/cmake/OptionsWinCE.cmake 2013-11-02 21:58:59 UTC (rev 158502) +++ trunk/Source/cmake/OptionsWinCE.cmake 2013-11-02 21:59:57 UTC (rev 158503) @@ -4,6 +4,7 @@ set(WTF_USE_WCHAR_UNICODE 1) add_definitions(-D_CE_CRT_ALLOW_WIN_MINMAX) +add_definitions(-DWTF_USE_EXPORT_MACROS=0) add_definitions(-DWTF_USE_WCHAR_UNICODE=1) add_definitions(-DWTF_USE_WINGDI=1) add_definitions(-DWTF_USE_WININET=1) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [158502] trunk/Source/WebCore
Title: [158502] trunk/Source/WebCore
Revision 158502
Author par...@webkit.org
Date 2013-11-02 14:58:59 -0700 (Sat, 02 Nov 2013)
Log Message
Port LoggingWin.cpp to WinCE
https://bugs.webkit.org/show_bug.cgi?id=123678
Reviewed by Darin Adler.
This makes it easier to use a common list of files
for the different Windows ports later.
* PlatformWin.cmake:
* platform/win/LoggingWin.cpp:
(WebCore::logLevelString):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/PlatformWin.cmake
trunk/Source/WebCore/platform/win/LoggingWin.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (158501 => 158502)
--- trunk/Source/WebCore/ChangeLog 2013-11-02 21:56:20 UTC (rev 158501)
+++ trunk/Source/WebCore/ChangeLog 2013-11-02 21:58:59 UTC (rev 158502)
@@ -1,5 +1,19 @@
2013-11-02 Patrick Gansterer
+Port LoggingWin.cpp to WinCE
+https://bugs.webkit.org/show_bug.cgi?id=123678
+
+Reviewed by Darin Adler.
+
+This makes it easier to use a common list of files
+for the different Windows ports later.
+
+* PlatformWin.cmake:
+* platform/win/LoggingWin.cpp:
+(WebCore::logLevelString):
+
+2013-11-02 Patrick Gansterer
+
Fix UnicodeWchar after r157330.
https://bugs.webkit.org/show_bug.cgi?id=123668
Modified: trunk/Source/WebCore/PlatformWin.cmake (158501 => 158502)
--- trunk/Source/WebCore/PlatformWin.cmake 2013-11-02 21:56:20 UTC (rev 158501)
+++ trunk/Source/WebCore/PlatformWin.cmake 2013-11-02 21:58:59 UTC (rev 158502)
@@ -46,6 +46,7 @@
platform/win/KeyEventWin.cpp
platform/win/LanguageWin.cpp
platform/win/LocalizedStringsWin.cpp
+platform/win/LoggingWin.cpp
platform/win/MIMETypeRegistryWin.cpp
platform/win/PasteboardWin.cpp
platform/win/PlatformMouseEventWin.cpp
Modified: trunk/Source/WebCore/platform/win/LoggingWin.cpp (158501 => 158502)
--- trunk/Source/WebCore/platform/win/LoggingWin.cpp 2013-11-02 21:56:20 UTC (rev 158501)
+++ trunk/Source/WebCore/platform/win/LoggingWin.cpp 2013-11-02 21:58:59 UTC (rev 158502)
@@ -38,6 +38,9 @@
String logLevelString()
{
+#if OS(WINCE)
+return emptyString();
+#else
DWORD length = GetEnvironmentVariableA(loggingEnvironmentVariable, 0, 0);
if (!length)
return emptyString();
@@ -48,6 +51,7 @@
return emptyString();
return String(buffer.get());
+#endif
}
} // namespace WebCore
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [158499] trunk/Source
Title: [158499] trunk/Source
Revision 158499
Author par...@webkit.org
Date 2013-11-02 14:47:46 -0700 (Sat, 02 Nov 2013)
Log Message
Fix UnicodeWchar after r157330.
https://bugs.webkit.org/show_bug.cgi?id=123668
Reviewed by Darin Adler.
Source/WebCore:
* editing/TextIterator.cpp:
(WebCore::SearchBuffer::append):
* platform/graphics/wince/FontWinCE.cpp:
(WebCore::generateComponents):
* platform/graphics/wince/GraphicsContextWinCE.cpp:
(WebCore::GraphicsContext::drawText):
* platform/text/wchar/TextBreakIteratorWchar.cpp:
(WebCore::isCharStop):
(WebCore::isLineStop):
(WebCore::isSentenceStop):
(WebCore::WordBreakIterator::next):
(WebCore::WordBreakIterator::previous):
Source/WTF:
* wtf/unicode/wchar/UnicodeWchar.cpp:
(unorm_normalize):
(u_strFoldCase):
(u_strToLower):
(u_strToUpper):
* wtf/unicode/wchar/UnicodeWchar.h:
(u_foldCase):
(u_isprint):
(u_isspace):
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/unicode/wchar/UnicodeWchar.cpp
trunk/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/editing/TextIterator.cpp
trunk/Source/WebCore/platform/graphics/wince/FontWinCE.cpp
trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
trunk/Source/WebCore/platform/text/wchar/TextBreakIteratorWchar.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (158498 => 158499)
--- trunk/Source/WTF/ChangeLog 2013-11-02 21:18:59 UTC (rev 158498)
+++ trunk/Source/WTF/ChangeLog 2013-11-02 21:47:46 UTC (rev 158499)
@@ -1,3 +1,20 @@
+2013-11-02 Patrick Gansterer
+
+Fix UnicodeWchar after r157330.
+https://bugs.webkit.org/show_bug.cgi?id=123668
+
+Reviewed by Darin Adler.
+
+* wtf/unicode/wchar/UnicodeWchar.cpp:
+(unorm_normalize):
+(u_strFoldCase):
+(u_strToLower):
+(u_strToUpper):
+* wtf/unicode/wchar/UnicodeWchar.h:
+(u_foldCase):
+(u_isprint):
+(u_isspace):
+
2013-11-02 Andreas Kling
Make remaining StringImpl functions return PassRef.
Modified: trunk/Source/WTF/wtf/unicode/wchar/UnicodeWchar.cpp (158498 => 158499)
--- trunk/Source/WTF/wtf/unicode/wchar/UnicodeWchar.cpp 2013-11-02 21:18:59 UTC (rev 158498)
+++ trunk/Source/WTF/wtf/unicode/wchar/UnicodeWchar.cpp 2013-11-02 21:47:46 UTC (rev 158499)
@@ -30,6 +30,7 @@
int unorm_normalize(const UChar*, int32_t, UNormalizationMode, int32_t, UChar*, int32_t, UErrorCode*)
{
ASSERT_NOT_REACHED();
+return 0;
}
UCharDirection u_charDirection(UChar32)
@@ -82,7 +83,7 @@
return 0;
}
-template
+template
static inline int convertWithFunction(UChar* result, int resultLength, const UChar* source, int sourceLength, UErrorCode& status)
{
UChar* resultIterator = result;
@@ -100,15 +101,15 @@
int u_strFoldCase(UChar* result, int resultLength, const UChar* source, int sourceLength, unsigned options, UErrorCode* status)
{
ASSERT_UNUSED(options, options == U_FOLD_CASE_DEFAULT);
-return convertWithFunction(result, resultLength, source, sourceLength, *status);
+return convertWithFunction(result, resultLength, source, sourceLength, *status);
}
int u_strToLower(UChar* result, int resultLength, const UChar* source, int sourceLength, const char*, UErrorCode* status)
{
-return convertWithFunction(result, resultLength, source, sourceLength, *status);
+return convertWithFunction(result, resultLength, source, sourceLength, *status);
}
int u_strToUpper(UChar* result, int resultLength, const UChar* source, int sourceLength, const char*, UErrorCode* status)
{
-return convertWithFunction(result, resultLength, source, sourceLength, *status);
+return convertWithFunction(result, resultLength, source, sourceLength, *status);
}
Modified: trunk/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h (158498 => 158499)
--- trunk/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h 2013-11-02 21:18:59 UTC (rev 158498)
+++ trunk/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h 2013-11-02 21:47:46 UTC (rev 158499)
@@ -63,7 +63,7 @@
U_BOUNDARY_NEUTRAL
};
-enum UDecompositionType { U_DT_NONE, U_DT_COMPAT, U_DT_FONT }
+enum UDecompositionType { U_DT_NONE, U_DT_COMPAT, U_DT_FONT };
enum UErrorCode { U_ZERO_ERROR = 0, U_ERROR };
@@ -79,6 +79,7 @@
// is implemented, that's not really worth the time.
#define U_GC_CC_MASK 0
+#define U_GC_CS_MASK 0
#define U_GC_CF_MASK 0
#define U_GC_CN_MASK 0
#define U_GC_LL_MASK 0
@@ -114,12 +115,14 @@
WTF_EXPORT_PRIVATE int unorm_normalize(const UChar* source, int32_t sourceLength, UNormalizationMode mode, int32_t options, UChar* result, int32_t resultLength, UErrorCode* status);
WTF_EXPORT_PRIVATE UCharDirection u_charDirection(UChar32);
WTF_EXPORT_PRIVATE UChar32 u_charMirror(UChar32);
-WTF_EXPORT_PRIVATE UCharCategory u_charType(UChar32);
-inline UChar32 u_foldCase(UChar32 character, unsigned option) { ASSERT_UNUSED(options, options == U_FOLD_CASE_DEFAULT); return towlower(character); }
+WTF_EXPORT_PRIVATE int8_t u_charT
[webkit-changes] [158492] trunk/Source
Title: [158492] trunk/Source
Revision 158492
Author par...@webkit.org
Date 2013-11-02 10:33:15 -0700 (Sat, 02 Nov 2013)
Log Message
Various small WinCE build fixes
Source/_javascript_Core:
* jsc.cpp:
(main):
Source/WebCore:
* editing/TextIterator.cpp:
(WebCore::SearchBuffer::append):
* platform/graphics/BitmapImage.h:
* platform/graphics/wince/ImageWinCE.cpp:
(WebCore::BitmapImage::getHBITMAPOfSize):
(WebCore::BitmapImage::drawFrameMatchingSourceSize):
* platform/graphics/wince/PlatformPathWinCE.h:
* platform/win/PopupMenuWin.h:
* rendering/RenderThemeWinCE.cpp:
(WebCore::RenderThemeWinCE::adjustMenuListButtonStyle):
Source/WebKit/wince:
* WebCoreSupport/FrameLoaderClientWinCE.cpp:
(WebKit::FrameLoaderClientWinCE::transitionToCommittedForNewPage):
* WebView.cpp:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/jsc.cpp
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/editing/TextIterator.cpp
trunk/Source/WebCore/platform/graphics/BitmapImage.h
trunk/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp
trunk/Source/WebCore/platform/graphics/wince/PlatformPathWinCE.h
trunk/Source/WebCore/platform/win/PopupMenuWin.h
trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp
trunk/Source/WebKit/wince/ChangeLog
trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp
trunk/Source/WebKit/wince/WebView.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (158491 => 158492)
--- trunk/Source/_javascript_Core/ChangeLog 2013-11-02 17:26:24 UTC (rev 158491)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-11-02 17:33:15 UTC (rev 158492)
@@ -1,5 +1,12 @@
2013-11-02 Patrick Gansterer
+Various small WinCE build fixes
+
+* jsc.cpp:
+(main):
+
+2013-11-02 Patrick Gansterer
+
Fix MSVC ARM build after r157581.
* jit/JITStubsARM.h:
Modified: trunk/Source/_javascript_Core/jsc.cpp (158491 => 158492)
--- trunk/Source/_javascript_Core/jsc.cpp 2013-11-02 17:26:24 UTC (rev 158491)
+++ trunk/Source/_javascript_Core/jsc.cpp 2013-11-02 17:33:15 UTC (rev 158492)
@@ -550,7 +550,6 @@
// testing/debugging, as it causes the post-mortem debugger not to be invoked. We reset the
// error mode here to work around Cygwin's behavior. See .
::SetErrorMode(0);
-#endif
#if defined(_DEBUG)
_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
@@ -560,6 +559,7 @@
_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE);
#endif
+#endif
timeBeginPeriod(1);
#endif
Modified: trunk/Source/WebCore/ChangeLog (158491 => 158492)
--- trunk/Source/WebCore/ChangeLog 2013-11-02 17:26:24 UTC (rev 158491)
+++ trunk/Source/WebCore/ChangeLog 2013-11-02 17:33:15 UTC (rev 158492)
@@ -1,3 +1,18 @@
+2013-11-02 Patrick Gansterer
+
+Various small WinCE build fixes
+
+* editing/TextIterator.cpp:
+(WebCore::SearchBuffer::append):
+* platform/graphics/BitmapImage.h:
+* platform/graphics/wince/ImageWinCE.cpp:
+(WebCore::BitmapImage::getHBITMAPOfSize):
+(WebCore::BitmapImage::drawFrameMatchingSourceSize):
+* platform/graphics/wince/PlatformPathWinCE.h:
+* platform/win/PopupMenuWin.h:
+* rendering/RenderThemeWinCE.cpp:
+(WebCore::RenderThemeWinCE::adjustMenuListButtonStyle):
+
2013-11-01 Alexey Proskuryakov
Add WebCrypto AES-CBC
Modified: trunk/Source/WebCore/editing/TextIterator.cpp (158491 => 158492)
--- trunk/Source/WebCore/editing/TextIterator.cpp 2013-11-02 17:26:24 UTC (rev 158491)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2013-11-02 17:33:15 UTC (rev 158492)
@@ -2351,7 +2351,7 @@
ASSERT(numFoldedCharacters);
ASSERT(numFoldedCharacters <= maxFoldedCharacters);
if (!error && numFoldedCharacters) {
-numFoldedCharacters = min(numFoldedCharacters, maxFoldedCharacters);
+numFoldedCharacters = std::min(numFoldedCharacters, maxFoldedCharacters);
append(foldedCharacters[0], true);
for (int i = 1; i < numFoldedCharacters; ++i)
append(foldedCharacters[i], false);
Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.h (158491 => 158492)
--- trunk/Source/WebCore/platform/graphics/BitmapImage.h 2013-11-02 17:26:24 UTC (rev 158491)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.h 2013-11-02 17:33:15 UTC (rev 158492)
@@ -191,7 +191,7 @@
#if USE(WINGDI)
virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
-const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect) OVERRIDE;
+const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect);
#endif
size_t currentFrame() const { return m_currentFrame; }
Modified: trunk/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp (158491 => 158492)
--- trunk/Source/WebCore/platfo
[webkit-changes] [158491] trunk/Source/JavaScriptCore
Title: [158491] trunk/Source/_javascript_Core
Revision 158491
Author par...@webkit.org
Date 2013-11-02 10:26:24 -0700 (Sat, 02 Nov 2013)
Log Message
Fix MSVC ARM build after r157581.
* jit/JITStubsARM.h:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/jit/JITStubsARM.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (158490 => 158491)
--- trunk/Source/_javascript_Core/ChangeLog 2013-11-02 16:59:53 UTC (rev 158490)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-11-02 17:26:24 UTC (rev 158491)
@@ -1,3 +1,9 @@
+2013-11-02 Patrick Gansterer
+
+Fix MSVC ARM build after r157581.
+
+* jit/JITStubsARM.h:
+
2013-11-01 Filip Pizlo
FTL should use a simple optimization pipeline by default
Modified: trunk/Source/_javascript_Core/jit/JITStubsARM.h (158490 => 158491)
--- trunk/Source/_javascript_Core/jit/JITStubsARM.h 2013-11-02 16:59:53 UTC (rev 158490)
+++ trunk/Source/_javascript_Core/jit/JITStubsARM.h 2013-11-02 17:26:24 UTC (rev 158491)
@@ -430,6 +430,13 @@
MSVC_BEGIN(ctiTrampolineEnd)
MSVC_BEGIN(ctiTrampoline ENDP)
MSVC_BEGIN()
+MSVC_BEGIN(ctiOpThrowNotCaught PROC)
+MSVC_BEGIN(add sp, sp, #68 ; sync with PRESERVEDR4_OFFSET)
+MSVC_BEGIN(ldmia sp!, {r4-r6, r8-r11, lr})
+MSVC_BEGIN(add sp, sp, #12)
+MSVC_BEGIN(bx lr)
+MSVC_BEGIN(ctiOpThrowNotCaught ENDP)
+MSVC_BEGIN()
MSVC(EXPORT cti_#op#)
MSVC(IMPORT JITStubThunked_#op#)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [158433] trunk/Source/WTF
Title: [158433] trunk/Source/WTF
Revision 158433
Author par...@webkit.org
Date 2013-11-01 06:57:51 -0700 (Fri, 01 Nov 2013)
Log Message
Buildfix for !USE(ICU_UNICODE) after 156968.
* wtf/unicode/CollatorDefault.cpp:
(WTF::Collator::userDefault):
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/unicode/CollatorDefault.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (158432 => 158433)
--- trunk/Source/WTF/ChangeLog 2013-11-01 12:48:51 UTC (rev 158432)
+++ trunk/Source/WTF/ChangeLog 2013-11-01 13:57:51 UTC (rev 158433)
@@ -1,3 +1,10 @@
+2013-11-01 Patrick Gansterer
+
+Buildfix for !USE(ICU_UNICODE) after 156968.
+
+* wtf/unicode/CollatorDefault.cpp:
+(WTF::Collator::userDefault):
+
2013-10-30 Oliver Hunt
Implement basic ES6 Math functions
Modified: trunk/Source/WTF/wtf/unicode/CollatorDefault.cpp (158432 => 158433)
--- trunk/Source/WTF/wtf/unicode/CollatorDefault.cpp 2013-11-01 12:48:51 UTC (rev 158432)
+++ trunk/Source/WTF/wtf/unicode/CollatorDefault.cpp 2013-11-01 13:57:51 UTC (rev 158433)
@@ -45,7 +45,7 @@
{
}
-OwnPtr Collator::userDefault()
+std::unique_ptr Collator::userDefault()
{
return std::make_unique(nullptr);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [158432] trunk/Source/WebCore
Title: [158432] trunk/Source/WebCore Revision 158432 Author par...@webkit.org Date 2013-11-01 05:48:51 -0700 (Fri, 01 Nov 2013) Log Message Buildfix for !ENABLE(INSPECTOR) after 157288. * inspector/InspectorInstrumentation.h: (WebCore::InspectorInstrumentation::willDispatchEvent): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/inspector/InspectorInstrumentation.h Diff Modified: trunk/Source/WebCore/ChangeLog (158431 => 158432) --- trunk/Source/WebCore/ChangeLog 2013-11-01 12:43:04 UTC (rev 158431) +++ trunk/Source/WebCore/ChangeLog 2013-11-01 12:48:51 UTC (rev 158432) @@ -1,3 +1,10 @@ +2013-11-01 Patrick Gansterer + +Buildfix for !ENABLE(INSPECTOR) after 157288. + +* inspector/InspectorInstrumentation.h: +(WebCore::InspectorInstrumentation::willDispatchEvent): + 2013-11-01 Mario Sanchez Prada [ATK] Avoid explicit traversal of text controls and the render tree in AtkText implementation Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (158431 => 158432) --- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2013-11-01 12:43:04 UTC (rev 158431) +++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2013-11-01 12:48:51 UTC (rev 158432) @@ -921,8 +921,7 @@ #else UNUSED_PARAM(document); UNUSED_PARAM(event); -UNUSED_PARAM(window); -UNUSED_PARAM(node); +UNUSED_PARAM(hasEventListeners); #endif return InspectorInstrumentationCookie(); } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [158370] trunk/Source/WebKit/win
Title: [158370] trunk/Source/WebKit/win
Revision 158370
Author par...@webkit.org
Date 2013-10-31 11:02:54 -0700 (Thu, 31 Oct 2013)
Log Message
[WIN] Make WebHistory compile without USE(CF)
https://bugs.webkit.org/show_bug.cgi?id=122010
Reviewed by Brent Fulgham.
Add an alternative code path for !USE(CF) to be able to
compile WebHistory without the CoreFoundation library.
* COMVariantSetter.h: Add support for setting a Vector.
* WebHistory.cpp:
(createUserInfoFromArray):
(createUserInfoFromHistoryItem):
(WebHistory::removeAllItems):
(WebHistory::removeItem):
(WebHistory::addItem):
(WebHistory::visitedURL):
* WebHistory.h:
Modified Paths
trunk/Source/WebKit/win/COMVariantSetter.h
trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/WebHistory.cpp
trunk/Source/WebKit/win/WebHistory.h
Diff
Modified: trunk/Source/WebKit/win/COMVariantSetter.h (158369 => 158370)
--- trunk/Source/WebKit/win/COMVariantSetter.h 2013-10-31 17:48:33 UTC (rev 158369)
+++ trunk/Source/WebKit/win/COMVariantSetter.h 2013-10-31 18:02:54 UTC (rev 158370)
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
template struct COMVariantSetter {};
@@ -120,6 +121,24 @@
}
};
+template struct COMVariantSetter> : COMVariantSetterBase> {
+static const VARTYPE VariantType = VT_ARRAY | COMVariantSetter::VariantType;
+
+static void setVariant(VARIANT* variant, const Vector& value)
+{
+ASSERT(V_VT(variant) == VT_EMPTY);
+
+SAFEARRAY* safeArray = ::SafeArrayCreateVector(COMVariantSetter::VariantType, 0, value.size());
+for (LONG i = 0; i < value.size(); ++i) {
+COMVariant item(value[i]);
+::SafeArrayPutElement(safeArray, &i, &item);
+}
+
+V_VT(variant) = VariantType;
+V_ARRAY(variant) = safeArray;
+}
+};
+
template
struct COMIUnknownVariantSetter : COMVariantSetterBase
{
Modified: trunk/Source/WebKit/win/ChangeLog (158369 => 158370)
--- trunk/Source/WebKit/win/ChangeLog 2013-10-31 17:48:33 UTC (rev 158369)
+++ trunk/Source/WebKit/win/ChangeLog 2013-10-31 18:02:54 UTC (rev 158370)
@@ -1,3 +1,23 @@
+2013-10-31 Patrick Gansterer
+
+[WIN] Make WebHistory compile without USE(CF)
+https://bugs.webkit.org/show_bug.cgi?id=122010
+
+Reviewed by Brent Fulgham.
+
+Add an alternative code path for !USE(CF) to be able to
+compile WebHistory without the CoreFoundation library.
+
+* COMVariantSetter.h: Add support for setting a Vector.
+* WebHistory.cpp:
+(createUserInfoFromArray):
+(createUserInfoFromHistoryItem):
+(WebHistory::removeAllItems):
+(WebHistory::removeItem):
+(WebHistory::addItem):
+(WebHistory::visitedURL):
+* WebHistory.h:
+
2013-10-30 Myles C. Maxfield
WebKit/win/WebKitGraphics.h:void WebDrawText(WebTextRenderInfo*); is never called
Modified: trunk/Source/WebKit/win/WebHistory.cpp (158369 => 158370)
--- trunk/Source/WebKit/win/WebHistory.cpp 2013-10-31 17:48:33 UTC (rev 158369)
+++ trunk/Source/WebKit/win/WebHistory.cpp 2013-10-31 18:02:54 UTC (rev 158370)
@@ -27,7 +27,6 @@
#include "WebKitDLL.h"
#include "WebHistory.h"
-#include "CFDictionaryPropertyBag.h"
#include "MemoryStream.h"
#include "WebKit.h"
#include "MarshallingHelpers.h"
@@ -35,7 +34,6 @@
#include "WebKit.h"
#include "WebNotificationCenter.h"
#include "WebPreferences.h"
-#include
#include
#include
#include
@@ -46,6 +44,13 @@
#include
#include
+#if USE(CF)
+#include "CFDictionaryPropertyBag.h"
+#include
+#else
+#include "COMPropertyBag.h"
+#endif
+
using namespace WebCore;
using namespace std;
@@ -55,25 +60,36 @@
return (diff < .01 && diff > -.01);
}
-static COMPtr createUserInfoFromArray(BSTR notificationStr, CFArrayRef arrayItem)
+static COMPtr createUserInfoFromArray(BSTR notificationStr, IWebHistoryItem** data, size_t size)
{
+#if USE(CF)
+RetainPtr arrayItem = adoptCF(CFArrayCreate(kCFAllocatorDefault, (const void**)data, size, &MarshallingHelpers::kIUnknownArrayCallBacks));
+
RetainPtr dictionary = adoptCF(
CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
RetainPtr key = adoptCF(MarshallingHelpers::BSTRToCFStringRef(notificationStr));
-CFDictionaryAddValue(dictionary.get(), key.get(), arrayItem);
+CFDictionaryAddValue(dictionary.get(), key.get(), arrayItem.get());
COMPtr result = CFDictionaryPropertyBag::createInstance();
result->setDictionary(dictionary.get());
-return result;
+return COMPtr(AdoptCOM, result.leakRef());
+#else
+Vector, 1> arrayItem;
+arrayItem.reserveInitialCapacity(size);
+for (size_t i = 0; i < size; ++i)
+arrayItem[i] = data[i];
+
+HashMap>> dictionary;
+String key(notificationStr, ::SysStringLen(notificationStr));
+dictionary.set(key, std::move(arrayItem));
+return COMPtr(AdoptCOM, COMPropertyBag>>::adopt(dictio
[webkit-changes] [158302] trunk/Tools
Title: [158302] trunk/Tools
Revision 158302
Author par...@webkit.org
Date 2013-10-30 12:10:47 -0700 (Wed, 30 Oct 2013)
Log Message
[WIN] Add executable entry points to DRT and WinLauncher
https://bugs.webkit.org/show_bug.cgi?id=121837
Reviewed by Brent Fulgham.
This allows to compile and run the executables without DLLLauncher.
* DumpRenderTree/win/DumpRenderTree.cpp:
(main):
(dllLauncherEntryPoint):
* WinLauncher/WinLauncher.cpp:
(wWinMain):
(dllLauncherEntryPoint):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp
trunk/Tools/WinLauncher/WinLauncher.cpp
Diff
Modified: trunk/Tools/ChangeLog (158301 => 158302)
--- trunk/Tools/ChangeLog 2013-10-30 19:10:20 UTC (rev 158301)
+++ trunk/Tools/ChangeLog 2013-10-30 19:10:47 UTC (rev 158302)
@@ -1,3 +1,19 @@
+2013-10-30 Patrick Gansterer
+
+[WIN] Add executable entry points to DRT and WinLauncher
+https://bugs.webkit.org/show_bug.cgi?id=121837
+
+Reviewed by Brent Fulgham.
+
+This allows to compile and run the executables without DLLLauncher.
+
+* DumpRenderTree/win/DumpRenderTree.cpp:
+(main):
+(dllLauncherEntryPoint):
+* WinLauncher/WinLauncher.cpp:
+(wWinMain):
+(dllLauncherEntryPoint):
+
2013-10-30 Filip Pizlo
run-jsc-stress-tests should handle ".." in paths and "slow!" in cmd's
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (158301 => 158302)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2013-10-30 19:10:20 UTC (rev 158301)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2013-10-30 19:10:47 UTC (rev 158302)
@@ -1306,7 +1306,7 @@
return EXCEPTION_CONTINUE_SEARCH;
}
-extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(int argc, const char* argv[])
+int main(int argc, const char* argv[])
{
// Cygwin calls ::SetErrorMode(SEM_FAILCRITICALERRORS), which we will inherit. This is bad for
// testing/debugging, as it causes the post-mortem debugger not to be invoked. We reset the
@@ -1469,3 +1469,8 @@
return 0;
}
+
+extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(int argc, const char* argv[])
+{
+return main(argc, argv);
+}
Modified: trunk/Tools/WinLauncher/WinLauncher.cpp (158301 => 158302)
--- trunk/Tools/WinLauncher/WinLauncher.cpp 2013-10-30 19:10:20 UTC (rev 158301)
+++ trunk/Tools/WinLauncher/WinLauncher.cpp 2013-10-30 19:10:47 UTC (rev 158302)
@@ -450,7 +450,7 @@
}
}
-extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(HINSTANCE, HINSTANCE, LPTSTR, int nCmdShow)
+int WINAPI wWinMain(HINSTANCE, HINSTANCE, PWSTR, int nCmdShow)
{
#ifdef _CRTDBG_MAP_ALLOC
_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
@@ -1005,3 +1005,8 @@
SetFocus(gViewWindow);
}
+
+extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpstrCmdLine, int nCmdShow)
+{
+return wWinMain(hInstance, hPrevInstance, lpstrCmdLine, nCmdShow);
+}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [158278] trunk/Source/WebKit/win
Title: [158278] trunk/Source/WebKit/win Revision 158278 Author par...@webkit.org Date 2013-10-30 10:33:39 -0700 (Wed, 30 Oct 2013) Log Message [WIN] Add missing USE(CFNETWORK) to WebError.h https://bugs.webkit.org/show_bug.cgi?id=121834 Reviewed by Brent Fulgham. WebError.cpp uses USE(CFNETWORK), so add it to the header too. * WebError.h: Modified Paths trunk/Source/WebKit/win/ChangeLog trunk/Source/WebKit/win/WebError.h Diff Modified: trunk/Source/WebKit/win/ChangeLog (158277 => 158278) --- trunk/Source/WebKit/win/ChangeLog 2013-10-30 17:31:40 UTC (rev 158277) +++ trunk/Source/WebKit/win/ChangeLog 2013-10-30 17:33:39 UTC (rev 158278) @@ -1,3 +1,14 @@ +2013-10-30 Patrick Gansterer + +[WIN] Add missing USE(CFNETWORK) to WebError.h +https://bugs.webkit.org/show_bug.cgi?id=121834 + +Reviewed by Brent Fulgham. + +WebError.cpp uses USE(CFNETWORK), so add it to the header too. + +* WebError.h: + 2013-10-30 pe...@outlook.com [Curl][Win] Suggested filename of download is not url decoded. Modified: trunk/Source/WebKit/win/WebError.h (158277 => 158278) --- trunk/Source/WebKit/win/WebError.h 2013-10-30 17:31:40 UTC (rev 158277) +++ trunk/Source/WebKit/win/WebError.h 2013-10-30 17:33:39 UTC (rev 158278) @@ -90,7 +90,9 @@ private: ULONG m_refCount; COMPtr m_userInfo; +#if USE(CFNETWORK) RetainPtr m_cfErrorUserInfoDict; +#endif WebCore::ResourceError m_error; }; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156654] trunk/Source/JavaScriptCore
Title: [156654] trunk/Source/_javascript_Core
Revision 156654
Author par...@webkit.org
Date 2013-09-30 08:42:49 -0700 (Mon, 30 Sep 2013)
Log Message
Fix compilation for COMPILER(MSVC) && !CPU(X86) after r156490.
https://bugs.webkit.org/show_bug.cgi?id=122102
Reviewed by Geoffrey Garen.
_AddressOfReturnAddress() is supported for all platforms of
ths Microsoft compiler, so we can use it for !CPU(X86) too.
* jit/JITOperationWrappers.h:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/jit/JITOperationWrappers.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (156653 => 156654)
--- trunk/Source/_javascript_Core/ChangeLog 2013-09-30 15:39:10 UTC (rev 156653)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-09-30 15:42:49 UTC (rev 156654)
@@ -1,3 +1,15 @@
+2013-09-30 Patrick Gansterer
+
+Fix compilation for COMPILER(MSVC) && !CPU(X86) after r156490.
+https://bugs.webkit.org/show_bug.cgi?id=122102
+
+Reviewed by Geoffrey Garen.
+
+_AddressOfReturnAddress() is supported for all platforms of
+ths Microsoft compiler, so we can use it for !CPU(X86) too.
+
+* jit/JITOperationWrappers.h:
+
2013-09-30 Gabor Rapcsanyi
Unreviewed. Build fix for DEBUG_VERBOSE mode after r156511.
Modified: trunk/Source/_javascript_Core/jit/JITOperationWrappers.h (156653 => 156654)
--- trunk/Source/_javascript_Core/jit/JITOperationWrappers.h 2013-09-30 15:39:10 UTC (rev 156653)
+++ trunk/Source/_javascript_Core/jit/JITOperationWrappers.h 2013-09-30 15:42:49 UTC (rev 156654)
@@ -307,7 +307,7 @@
#define _J_FUNCTION_WRAPPER_WITH_RETURN_ADDRESS_EJI(function) FUNCTION_WRAPPER_WITH_RETURN_ADDRESS(function, 0, SH4_SCRATCH_REGISTER)
#define _V_FUNCTION_WRAPPER_WITH_RETURN_ADDRESS_EJCI(function) FUNCTION_WRAPPER_WITH_RETURN_ADDRESS(function, 4, SH4_SCRATCH_REGISTER)
-#elif COMPILER(MSVC) && CPU(X86)
+#elif COMPILER(MSVC)
#define _P_FUNCTION_WRAPPER_WITH_RETURN_ADDRESS_E(function) \
void* JIT_OPERATION function(ExecState* exec) { return function##WithReturnAddress(exec, ReturnAddressPtr(*(void**)_AddressOfReturnAddress())); }
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156650] trunk/Source/WebKit/wince
Title: [156650] trunk/Source/WebKit/wince Revision 156650 Author par...@webkit.org Date 2013-09-30 07:05:46 -0700 (Mon, 30 Sep 2013) Log Message Unreviewed WinCE build fix after r153927. * WebView.cpp: (WebView::WebView): Modified Paths trunk/Source/WebKit/wince/ChangeLog trunk/Source/WebKit/wince/WebView.cpp Diff Modified: trunk/Source/WebKit/wince/ChangeLog (156649 => 156650) --- trunk/Source/WebKit/wince/ChangeLog 2013-09-30 13:58:00 UTC (rev 156649) +++ trunk/Source/WebKit/wince/ChangeLog 2013-09-30 14:05:46 UTC (rev 156650) @@ -1,5 +1,12 @@ 2013-09-30 Patrick Gansterer +Unreviewed WinCE build fix after r153927. + +* WebView.cpp: +(WebView::WebView): + +2013-09-30 Patrick Gansterer + Unreviewed WinCE build fix after r155289. * WebCoreSupport/FrameLoaderClientWinCE.cpp: Modified: trunk/Source/WebKit/wince/WebView.cpp (156649 => 156650) --- trunk/Source/WebKit/wince/WebView.cpp 2013-09-30 13:58:00 UTC (rev 156649) +++ trunk/Source/WebKit/wince/WebView.cpp 2013-09-30 14:05:46 UTC (rev 156650) @@ -99,13 +99,13 @@ pageClients.inspectorClient = new WebKit::InspectorClientWinCE(this); m_page = new Page(pageClients); -Settings* settings = m_page->settings(); -settings->setDefaultFixedFontSize(14); -settings->setDefaultFontSize(14); -settings->setMinimumFontSize(8); -settings->setMinimumLogicalFontSize(8); -settings->setScriptEnabled(true); -settings->setLoadsImagesAutomatically(true); +Settings& settings = m_page->settings(); +settings.setDefaultFixedFontSize(14); +settings.setDefaultFontSize(14); +settings.setMinimumFontSize(8); +settings.setMinimumLogicalFontSize(8); +settings.setScriptEnabled(true); +settings.setLoadsImagesAutomatically(true); WebKit::FrameLoaderClientWinCE* loaderClient = new WebKit::FrameLoaderClientWinCE(this); RefPtr frame = Frame::create(m_page, 0, loaderClient); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156649] trunk/Source/WebKit/wince
Title: [156649] trunk/Source/WebKit/wince
Revision 156649
Author par...@webkit.org
Date 2013-09-30 06:58:00 -0700 (Mon, 30 Sep 2013)
Log Message
Unreviewed WinCE build fix after r155289.
* WebCoreSupport/FrameLoaderClientWinCE.cpp:
(WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForResponse):
(WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForNewWindowAction):
(WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForNavigationAction):
(WebKit::FrameLoaderClientWinCE::dispatchWillSubmitForm):
Modified Paths
trunk/Source/WebKit/wince/ChangeLog
trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp
Diff
Modified: trunk/Source/WebKit/wince/ChangeLog (156648 => 156649)
--- trunk/Source/WebKit/wince/ChangeLog 2013-09-30 13:57:41 UTC (rev 156648)
+++ trunk/Source/WebKit/wince/ChangeLog 2013-09-30 13:58:00 UTC (rev 156649)
@@ -1,5 +1,15 @@
2013-09-30 Patrick Gansterer
+Unreviewed WinCE build fix after r155289.
+
+* WebCoreSupport/FrameLoaderClientWinCE.cpp:
+(WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForResponse):
+(WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForNewWindowAction):
+(WebKit::FrameLoaderClientWinCE::dispatchDecidePolicyForNavigationAction):
+(WebKit::FrameLoaderClientWinCE::dispatchWillSubmitForm):
+
+2013-09-30 Patrick Gansterer
+
Unreviewed WinCE build fix after r154178.
* WebView.cpp:
Modified: trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp (156648 => 156649)
--- trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp 2013-09-30 13:57:41 UTC (rev 156648)
+++ trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp 2013-09-30 13:58:00 UTC (rev 156649)
@@ -142,24 +142,24 @@
void FrameLoaderClientWinCE::dispatchDecidePolicyForResponse(FramePolicyFunction policyFunction, const WebCore::ResourceResponse& response, const WebCore::ResourceRequest&)
{
if (canShowMIMEType(response.mimeType()))
-(m_frame->loader().policyChecker()->*policyFunction)(PolicyUse);
+(m_frame->loader().policyChecker().*policyFunction)(PolicyUse);
else
-(m_frame->loader().policyChecker()->*policyFunction)(PolicyDownload);
+(m_frame->loader().policyChecker().*policyFunction)(PolicyDownload);
}
void FrameLoaderClientWinCE::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction policyFunction, const NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr, const String&)
{
-(m_frame->loader().policyChecker()->*policyFunction)(PolicyUse);
+(m_frame->loader().policyChecker().*policyFunction)(PolicyUse);
}
void FrameLoaderClientWinCE::dispatchDecidePolicyForNavigationAction(FramePolicyFunction policyFunction, const NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr)
{
-(m_frame->loader().policyChecker()->*policyFunction)(PolicyUse);
+(m_frame->loader().policyChecker().*policyFunction)(PolicyUse);
}
void FrameLoaderClientWinCE::dispatchWillSubmitForm(FramePolicyFunction policyFunction, PassRefPtr)
{
-(m_frame->loader().policyChecker()->*policyFunction)(PolicyUse);
+(m_frame->loader().policyChecker().*policyFunction)(PolicyUse);
}
PassRefPtr FrameLoaderClientWinCE::createPlugin(const IntSize&, HTMLPlugInElement*, const URL&, const Vector&, const Vector&, const String&, bool)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156648] trunk/Source/WebKit/wince
Title: [156648] trunk/Source/WebKit/wince Revision 156648 Author par...@webkit.org Date 2013-09-30 06:57:41 -0700 (Mon, 30 Sep 2013) Log Message Unreviewed WinCE build fix after r154178. * WebView.cpp: (WebView::wndProc): Modified Paths trunk/Source/WebKit/wince/ChangeLog trunk/Source/WebKit/wince/WebView.cpp Diff Modified: trunk/Source/WebKit/wince/ChangeLog (156647 => 156648) --- trunk/Source/WebKit/wince/ChangeLog 2013-09-30 13:15:31 UTC (rev 156647) +++ trunk/Source/WebKit/wince/ChangeLog 2013-09-30 13:57:41 UTC (rev 156648) @@ -1,3 +1,10 @@ +2013-09-30 Patrick Gansterer + +Unreviewed WinCE build fix after r154178. + +* WebView.cpp: +(WebView::wndProc): + 2013-09-26 Darin Adler rename KURL to URL Modified: trunk/Source/WebKit/wince/WebView.cpp (156647 => 156648) --- trunk/Source/WebKit/wince/WebView.cpp 2013-09-30 13:15:31 UTC (rev 156647) +++ trunk/Source/WebKit/wince/WebView.cpp 2013-09-30 13:57:41 UTC (rev 156648) @@ -411,12 +411,12 @@ case WM_LBUTTONUP: case WM_MBUTTONUP: case WM_RBUTTONUP: -if (frame()->eventHandler() && view()->didFirstLayout()) +if (view()->didFirstLayout()) handled = handleMouseEvent(hWnd, message, wParam, lParam); break; case WM_MOUSEWHEEL: -if (frame()->eventHandler() && view()->didFirstLayout()) +if (view()->didFirstLayout()) handled = handleMouseWheel(hWnd, wParam, lParam, wParam & MK_SHIFT); break; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156538] trunk/Tools
Title: [156538] trunk/Tools
Revision 156538
Author par...@webkit.org
Date 2013-09-27 06:01:32 -0700 (Fri, 27 Sep 2013)
Log Message
Add general CMakeLists.txt for DRT
https://bugs.webkit.org/show_bug.cgi?id=119268
Reviewed by Gyuyoung Kim.
The new file allows better sharing between ports.
* CMakeLists.txt:
* DumpRenderTree/CMakeLists.txt: Added.
* DumpRenderTree/PlatformEfl.cmake: Added.
* DumpRenderTree/efl/CMakeLists.txt: Removed.
Modified Paths
trunk/Tools/CMakeLists.txt
trunk/Tools/ChangeLog
Added Paths
trunk/Tools/DumpRenderTree/CMakeLists.txt
trunk/Tools/DumpRenderTree/PlatformEfl.cmake
Removed Paths
trunk/Tools/DumpRenderTree/efl/CMakeLists.txt
Diff
Modified: trunk/Tools/CMakeLists.txt (156537 => 156538)
--- trunk/Tools/CMakeLists.txt 2013-09-27 12:58:02 UTC (rev 156537)
+++ trunk/Tools/CMakeLists.txt 2013-09-27 13:01:32 UTC (rev 156538)
@@ -7,7 +7,7 @@
add_subdirectory(EWebLauncher/ControlTheme)
if (ENABLE_WEBKIT)
-add_subdirectory(DumpRenderTree/efl)
+add_subdirectory(DumpRenderTree)
add_subdirectory(EWebLauncher)
endif ()
Modified: trunk/Tools/ChangeLog (156537 => 156538)
--- trunk/Tools/ChangeLog 2013-09-27 12:58:02 UTC (rev 156537)
+++ trunk/Tools/ChangeLog 2013-09-27 13:01:32 UTC (rev 156538)
@@ -1,3 +1,17 @@
+2013-09-27 Patrick Gansterer
+
+Add general CMakeLists.txt for DRT
+https://bugs.webkit.org/show_bug.cgi?id=119268
+
+Reviewed by Gyuyoung Kim.
+
+The new file allows better sharing between ports.
+
+* CMakeLists.txt:
+* DumpRenderTree/CMakeLists.txt: Added.
+* DumpRenderTree/PlatformEfl.cmake: Added.
+* DumpRenderTree/efl/CMakeLists.txt: Removed.
+
2013-09-27 Allan Sandfeld Jensen
[Qt] Fix force_static_libs_as_shared in WebKit2
Added: trunk/Tools/DumpRenderTree/CMakeLists.txt (0 => 156538)
--- trunk/Tools/DumpRenderTree/CMakeLists.txt (rev 0)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2013-09-27 13:01:32 UTC (rev 156538)
@@ -0,0 +1,75 @@
+set(DumpRenderTree_SOURCES
+AccessibilityController.cpp
+AccessibilityTextMarker.cpp
+AccessibilityUIElement.cpp
+CyclicRedundancyCheck.cpp
+DumpRenderTreeCommon.cpp
+GCController.cpp
+PixelDumpSupport.cpp
+TestRunner.cpp
+WorkQueue.cpp
+)
+
+set(DumpRenderTree_LIBRARIES
+_javascript_Core
+WTF
+WebCore
+WebCoreTestSupport
+WebKit
+)
+
+set(DumpRenderTree_INCLUDE_DIRECTORIES
+${WEBCORE_DIR}
+${WEBCORE_DIR}/bindings
+${WEBCORE_DIR}/bridge
+${WEBCORE_DIR}/bridge/jsc
+${WEBCORE_DIR}/css
+${WEBCORE_DIR}/dom
+${WEBCORE_DIR}/editing
+${WEBCORE_DIR}/history
+${WEBCORE_DIR}/html
+${WEBCORE_DIR}/inspector
+${WEBCORE_DIR}/loader
+${WEBCORE_DIR}/loader/cache
+${WEBCORE_DIR}/loader/icon
+${WEBCORE_DIR}/page
+${WEBCORE_DIR}/page/animation
+${WEBCORE_DIR}/platform
+${WEBCORE_DIR}/platform/animation
+${WEBCORE_DIR}/platform/graphics
+${WEBCORE_DIR}/platform/graphics/transforms
+${WEBCORE_DIR}/platform/network
+${WEBCORE_DIR}/platform/text
+${WEBCORE_DIR}/plugins
+${WEBCORE_DIR}/rendering
+${WEBCORE_DIR}/rendering/shapes
+${WEBCORE_DIR}/rendering/style
+${_javascript_CORE_DIR}
+${_javascript_CORE_DIR}/API
+${_javascript_CORE_DIR}/assembler
+${_javascript_CORE_DIR}/bytecode
+${_javascript_CORE_DIR}/dfg
+${_javascript_CORE_DIR}/disassembler
+${_javascript_CORE_DIR}/heap
+${_javascript_CORE_DIR}/interpreter
+${_javascript_CORE_DIR}/jit
+${_javascript_CORE_DIR}/llint
+${_javascript_CORE_DIR}/profiler
+${_javascript_CORE_DIR}/runtime
+${_javascript_CORE_DIR}/ForwardingHeaders
+${TOOLS_DIR}/DumpRenderTree
+${WTF_DIR}
+${CMAKE_SOURCE_DIR}/Source
+${CMAKE_BINARY_DIR}
+${DERIVED_SOURCES_WEBCORE_DIR}
+${WEBCORE_DIR}/bindings/js
+${WEBCORE_DIR}/testing/js
+)
+
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+
+include_directories(${DumpRenderTree_INCLUDE_DIRECTORIES})
+
+add_executable(DumpRenderTree ${DumpRenderTree_SOURCES})
+target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES})
+set_target_properties(DumpRenderTree PROPERTIES FOLDER "Tools")
Added: trunk/Tools/DumpRenderTree/PlatformEfl.cmake (0 => 156538)
--- trunk/Tools/DumpRenderTree/PlatformEfl.cmake (rev 0)
+++ trunk/Tools/DumpRenderTree/PlatformEfl.cmake 2013-09-27 13:01:32 UTC (rev 156538)
@@ -0,0 +1,80 @@
+list(APPEND DumpRenderTree_SOURCES
+atk/AccessibilityCallbacksAtk.cpp
+atk/AccessibilityControllerAtk.cpp
+atk/AccessibilityNotificationHandlerAtk.cpp
+atk/AccessibilityUIElementAtk.cpp
+
+cairo/PixelDumpSupportCairo.cpp
+
+efl/AccessibilityControllerEfl.cpp
+efl/DumpHistoryItem.cpp
+efl/DumpRenderTree.cpp
+efl/DumpRenderTreeChrome.cpp
+efl/DumpRenderTreeView.cpp
+efl/EditingCallbacks.cpp
+efl/EventSender.cpp
+efl/FontMan
[webkit-changes] [156443] trunk/Source/WTF
Title: [156443] trunk/Source/WTF Revision 156443 Author par...@webkit.org Date 2013-09-25 19:03:45 -0700 (Wed, 25 Sep 2013) Log Message Fix compilation with new MSVC compiler for Windows CE https://bugs.webkit.org/show_bug.cgi?id=121914 Reviewed by Darin Adler. Remove code to support older Windows CE versions, since those old versions do not support C+11, which is required in the meantime. * wtf/Atomics.h: * wtf/Platform.h: Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/Atomics.h trunk/Source/WTF/wtf/Platform.h Diff Modified: trunk/Source/WTF/ChangeLog (156442 => 156443) --- trunk/Source/WTF/ChangeLog 2013-09-26 02:01:01 UTC (rev 156442) +++ trunk/Source/WTF/ChangeLog 2013-09-26 02:03:45 UTC (rev 156443) @@ -1,3 +1,16 @@ +2013-09-25 Patrick Gansterer + +Fix compilation with new MSVC compiler for Windows CE +https://bugs.webkit.org/show_bug.cgi?id=121914 + +Reviewed by Darin Adler. + +Remove code to support older Windows CE versions, since those old +versions do not support C+11, which is required in the meantime. + +* wtf/Atomics.h: +* wtf/Platform.h: + 2013-09-25 Anders Carlsson Move KeyValuePairTraits inside HashMap Modified: trunk/Source/WTF/wtf/Atomics.h (156442 => 156443) --- trunk/Source/WTF/wtf/Atomics.h 2013-09-26 02:01:01 UTC (rev 156442) +++ trunk/Source/WTF/wtf/Atomics.h 2013-09-26 02:03:45 UTC (rev 156443) @@ -63,9 +63,7 @@ #include #if OS(WINDOWS) -#if OS(WINCE) -#include -#elif !COMPILER(GCC) +#if !COMPILER(GCC) extern "C" void _ReadWriteBarrier(void); #pragma intrinsic(_ReadWriteBarrier) #endif Modified: trunk/Source/WTF/wtf/Platform.h (156442 => 156443) --- trunk/Source/WTF/wtf/Platform.h 2013-09-26 02:01:01 UTC (rev 156442) +++ trunk/Source/WTF/wtf/Platform.h 2013-09-26 02:03:45 UTC (rev 156443) @@ -497,17 +497,6 @@ #define WTF_USE_QUERY_PERFORMANCE_COUNTER 1 #endif -#if OS(WINCE) && !PLATFORM(QT) -#define NOSHLWAPI /* shlwapi.h not available on WinCe */ - -/* MSDN documentation says these functions are provided with uspce.lib. But we cannot find this file. */ -#define __usp10__ /* disable "usp10.h" */ - -#define _INC_ASSERT/* disable "assert.h" */ -#define assert(x) - -#endif /* OS(WINCE) && !PLATFORM(QT) */ - #if !USE(WCHAR_UNICODE) #define WTF_USE_ICU_UNICODE 1 #endif ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156430] trunk/Source/WebKit/win
Title: [156430] trunk/Source/WebKit/win
Revision 156430
Author par...@webkit.org
Date 2013-09-25 16:18:10 -0700 (Wed, 25 Sep 2013)
Log Message
[WIN] Replace CF time functions with Windows API functions in WebHistory
https://bugs.webkit.org/show_bug.cgi?id=121599
Reviewed by Brent Fulgham.
This reduces the dependencies on the CoreFoundation library.
* WebHistory.cpp:
(addDayToSystemTime):
(getDayBoundaries):
(beginningOfDay):
(dateKey):
(WebHistory::orderedLastVisitedDays):
* WebHistory.h:
Modified Paths
trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/WebHistory.cpp
trunk/Source/WebKit/win/WebHistory.h
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (156429 => 156430)
--- trunk/Source/WebKit/win/ChangeLog 2013-09-25 22:54:54 UTC (rev 156429)
+++ trunk/Source/WebKit/win/ChangeLog 2013-09-25 23:18:10 UTC (rev 156430)
@@ -1,3 +1,20 @@
+2013-09-25 Patrick Gansterer
+
+[WIN] Replace CF time functions with Windows API functions in WebHistory
+https://bugs.webkit.org/show_bug.cgi?id=121599
+
+Reviewed by Brent Fulgham.
+
+This reduces the dependencies on the CoreFoundation library.
+
+* WebHistory.cpp:
+(addDayToSystemTime):
+(getDayBoundaries):
+(beginningOfDay):
+(dateKey):
+(WebHistory::orderedLastVisitedDays):
+* WebHistory.h:
+
2013-09-24 Brent Fulgham
[Windows] Refactor RuntimeEnabledFeatures as a Singleton.
Modified: trunk/Source/WebKit/win/WebHistory.cpp (156429 => 156430)
--- trunk/Source/WebKit/win/WebHistory.cpp 2013-09-25 22:54:54 UTC (rev 156429)
+++ trunk/Source/WebKit/win/WebHistory.cpp 2013-09-25 23:18:10 UTC (rev 156430)
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include
#include
@@ -75,22 +76,52 @@
return info;
}
-static void getDayBoundaries(CFAbsoluteTime day, CFAbsoluteTime& beginningOfDay, CFAbsoluteTime& beginningOfNextDay)
+static inline void addDayToSystemTime(SYSTEMTIME& systemTime)
{
-RetainPtr timeZone = adoptCF(CFTimeZoneCopyDefault());
-CFGregorianDate date = CFAbsoluteTimeGetGregorianDate(day, timeZone.get());
-date.hour = 0;
-date.minute = 0;
-date.second = 0;
-beginningOfDay = CFGregorianDateGetAbsoluteTime(date, timeZone.get());
-date.day += 1;
-beginningOfNextDay = CFGregorianDateGetAbsoluteTime(date, timeZone.get());
+systemTime.wDay += 1;
+if (systemTime.wDay > 31) {
+systemTime.wDay = 1;
+systemTime.wMonth += 1;
+}
+if (systemTime.wMonth > 12) {
+systemTime.wMonth = 1;
+systemTime.wYear += 1;
+}
+
+// Convert to and from VariantTime to fix invalid dates like 2001-04-31.
+DATE date = 0.0;
+::SystemTimeToVariantTime(&systemTime, &date);
+::VariantTimeToSystemTime(date, &systemTime);
}
-static inline CFAbsoluteTime beginningOfDay(CFAbsoluteTime date)
+static void getDayBoundaries(DATE day, DATE& beginningOfDay, DATE& beginningOfNextDay)
{
-static CFAbsoluteTime cachedBeginningOfDay = std::numeric_limits::quiet_NaN();
-static CFAbsoluteTime cachedBeginningOfNextDay;
+SYSTEMTIME systemTime;
+::VariantTimeToSystemTime(day, &systemTime);
+
+SYSTEMTIME beginningLocalTime;
+::SystemTimeToTzSpecificLocalTime(0, &systemTime, &beginningLocalTime);
+beginningLocalTime.wHour = 0;
+beginningLocalTime.wMinute = 0;
+beginningLocalTime.wSecond = 0;
+beginningLocalTime.wMilliseconds = 0;
+
+SYSTEMTIME beginningOfNextDayLocalTime = beginningLocalTime;
+addDayToSystemTime(beginningOfNextDayLocalTime);
+
+SYSTEMTIME beginningSystemTime;
+::TzSpecificLocalTimeToSystemTime(0, &beginningLocalTime, &beginningSystemTime);
+::SystemTimeToVariantTime(&beginningSystemTime, &beginningOfDay);
+
+SYSTEMTIME beginningOfNextDaySystemTime;
+::TzSpecificLocalTimeToSystemTime(0, &beginningOfNextDayLocalTime, &beginningOfNextDaySystemTime);
+::SystemTimeToVariantTime(&beginningOfNextDaySystemTime, &beginningOfNextDay);
+}
+
+static inline DATE beginningOfDay(DATE date)
+{
+static DATE cachedBeginningOfDay = std::numeric_limits::quiet_NaN();
+static DATE cachedBeginningOfNextDay;
if (!(date >= cachedBeginningOfDay && date < cachedBeginningOfNextDay))
getDayBoundaries(date, cachedBeginningOfDay, cachedBeginningOfNextDay);
return cachedBeginningOfDay;
@@ -98,10 +129,10 @@
static inline WebHistory::DateKey dateKey(DATE date)
{
-// Converting from double (CFAbsoluteTime) to int64_t (WebHistoryDateKey) is
-// safe here because all sensible dates are in the range -2**48 .. 2**47 which
+// Converting from double (DATE) to int64_t (WebHistoryDateKey) is safe
+// here because all sensible dates are in the range -2**48 .. 2**47 which
// safely fits in an int64_t.
-return beginningOfDay(MarshallingHelpers::DATEToCFAbsoluteTime(date));
+return beginningOfDay(date) * secondsPerDay;
}
// WebHistory ---
[webkit-changes] [156418] trunk/Tools
Title: [156418] trunk/Tools
Revision 156418
Author par...@webkit.org
Date 2013-09-25 12:22:24 -0700 (Wed, 25 Sep 2013)
Log Message
[WIN] Fix MSVC C4146 compiler warning
https://bugs.webkit.org/show_bug.cgi?id=121838
Reviewed by Brent Fulgham.
Fix some variables from unsinged to int to fix the compiler warning
"unary minus operator applied to unsigned type, result still unsigned".
* DumpRenderTree/WorkQueueItem.h:
(BackItem::BackItem):
(ForwardItem::ForwardItem):
* DumpRenderTree/win/DumpRenderTree.cpp:
(createWebViewAndOffscreenWindow):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/WorkQueueItem.h
trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp
Diff
Modified: trunk/Tools/ChangeLog (156417 => 156418)
--- trunk/Tools/ChangeLog 2013-09-25 19:13:04 UTC (rev 156417)
+++ trunk/Tools/ChangeLog 2013-09-25 19:22:24 UTC (rev 156418)
@@ -1,3 +1,19 @@
+2013-09-25 Patrick Gansterer
+
+[WIN] Fix MSVC C4146 compiler warning
+https://bugs.webkit.org/show_bug.cgi?id=121838
+
+Reviewed by Brent Fulgham.
+
+Fix some variables from unsinged to int to fix the compiler warning
+"unary minus operator applied to unsigned type, result still unsigned".
+
+* DumpRenderTree/WorkQueueItem.h:
+(BackItem::BackItem):
+(ForwardItem::ForwardItem):
+* DumpRenderTree/win/DumpRenderTree.cpp:
+(createWebViewAndOffscreenWindow):
+
2013-09-25 Zan Dobersek
[GTK] Switch the 64-bit Release builder to testing layout tests under WK2
Modified: trunk/Tools/DumpRenderTree/WorkQueueItem.h (156417 => 156418)
--- trunk/Tools/DumpRenderTree/WorkQueueItem.h 2013-09-25 19:13:04 UTC (rev 156417)
+++ trunk/Tools/DumpRenderTree/WorkQueueItem.h 2013-09-25 19:22:24 UTC (rev 156418)
@@ -132,7 +132,7 @@
class BackItem : public BackForwardItem {
public:
-BackItem(unsigned howFar)
+BackItem(int howFar)
: BackForwardItem(-howFar)
{
}
@@ -140,7 +140,7 @@
class ForwardItem : public BackForwardItem {
public:
-ForwardItem(unsigned howFar)
+ForwardItem(int howFar)
: BackForwardItem(howFar)
{
}
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (156417 => 156418)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2013-09-25 19:13:04 UTC (rev 156417)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2013-09-25 19:22:24 UTC (rev 156418)
@@ -1201,8 +1201,8 @@
IWebView* createWebViewAndOffscreenWindow(HWND* webViewWindow)
{
-unsigned maxViewWidth = TestRunner::viewWidth;
-unsigned maxViewHeight = TestRunner::viewHeight;
+int maxViewWidth = TestRunner::viewWidth;
+int maxViewHeight = TestRunner::viewHeight;
HWND hostWindow = CreateWindowEx(WS_EX_TOOLWINDOW, kDumpRenderTreeClassName, TEXT("DumpRenderTree"), WS_POPUP,
-maxViewWidth, -maxViewHeight, maxViewWidth, maxViewHeight, 0, 0, GetModuleHandle(0), 0);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156405] trunk/Tools
Title: [156405] trunk/Tools
Revision 156405
Author par...@webkit.org
Date 2013-09-25 11:00:18 -0700 (Wed, 25 Sep 2013)
Log Message
Add style checker for CMake lists
https://bugs.webkit.org/show_bug.cgi?id=121764
Reviewed by Ryosuke Niwa.
Add an additional check to make sure that list of files are sorted.
Exclude lists of include directories for now, since the order
can be importent for compilation of some files.
* Scripts/webkitpy/style/checkers/cmake.py:
(CMakeChecker.check):
(CMakeChecker._check_indent):
(CMakeChecker):
(CMakeChecker._check_list_order):
(CMakeChecker._list_item_path):
* Scripts/webkitpy/style/checkers/cmake_unittest.py:
(CMakeCheckerTest.test_check):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py
trunk/Tools/Scripts/webkitpy/style/checkers/cmake_unittest.py
Diff
Modified: trunk/Tools/ChangeLog (156404 => 156405)
--- trunk/Tools/ChangeLog 2013-09-25 17:45:59 UTC (rev 156404)
+++ trunk/Tools/ChangeLog 2013-09-25 18:00:18 UTC (rev 156405)
@@ -1,5 +1,25 @@
2013-09-25 Patrick Gansterer
+Add style checker for CMake lists
+https://bugs.webkit.org/show_bug.cgi?id=121764
+
+Reviewed by Ryosuke Niwa.
+
+Add an additional check to make sure that list of files are sorted.
+Exclude lists of include directories for now, since the order
+can be importent for compilation of some files.
+
+* Scripts/webkitpy/style/checkers/cmake.py:
+(CMakeChecker.check):
+(CMakeChecker._check_indent):
+(CMakeChecker):
+(CMakeChecker._check_list_order):
+(CMakeChecker._list_item_path):
+* Scripts/webkitpy/style/checkers/cmake_unittest.py:
+(CMakeCheckerTest.test_check):
+
+2013-09-25 Patrick Gansterer
+
CMakeChecker takes unusually long time to run
https://bugs.webkit.org/show_bug.cgi?id=105662
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py (156404 => 156405)
--- trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py 2013-09-25 17:45:59 UTC (rev 156404)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py 2013-09-25 18:00:18 UTC (rev 156405)
@@ -93,6 +93,7 @@
self._num_lines = len(lines)
for l in xrange(self._num_lines):
self._process_line(l + 1, lines[l])
+self._check_list_order(lines)
def _process_line(self, line_number, line_content):
if match('(^|\ +)#', line_content):
@@ -146,3 +147,59 @@
def _check_indent(self, line_number, line_content):
#TODO (halton): add indent checking
pass
+
+def _check_list_order(self, lines):
+last_line = None
+
+line_number = 0
+for line in lines:
+line_number += 1
+line = line.strip()
+
+if last_line == None:
+matched = match('(set\(|list\((APPEND|REMOVE_ITEM) )(?P\w+)(?P\s+\w+)?$', line)
+if matched:
+# FIXME: Add handling for include directories.
+if 'INCLUDE_DIRECTORIES' in matched.group('name'):
+continue
+empty_lines_count = 0
+last_line = ''
+if matched.group('item'):
+msg = 'First listitem "%s" should be in a new line.' % matched.group('item').strip()
+self._handle_style_error(line_number, 'list/parentheses', 5, msg)
+else:
+matched = match('(?P.+)?\)$', line)
+if matched:
+last_line = None
+if matched.group('item'):
+msg = 'The parentheses after the last listitem "%s" should be in a new line.' % matched.group('item').strip()
+self._handle_style_error(line_number, 'list/parentheses', 5, msg)
+elif line == '':
+empty_lines_count += 1
+else:
+last_line_path = self._list_item_path(last_line)
+line_path = self._list_item_path(line)
+
+if line == last_line:
+msg = 'The item "%s" should be added only once to the list.' % line
+self._handle_style_error(line_number, 'list/duplicate', 5, msg)
+elif line_path < last_line_path or line_path == last_line_path and line < last_line:
+msg = 'Alphabetical sorting problem. "%s" should be before "%s".' % (line, last_line)
+self._handle_style_error(line_number, 'list/order', 5, msg)
+elif last_line != '':
+if line_path != last_line_path:
+if empty_lines_count != 1:
+msg = 'There should be exactly one empty line instead of %d between "%s" and "%s".' % (empty_lines_count, last_line, line)
+self._handle_sty
[webkit-changes] [156403] trunk/Tools
Title: [156403] trunk/Tools
Revision 156403
Author par...@webkit.org
Date 2013-09-25 10:40:19 -0700 (Wed, 25 Sep 2013)
Log Message
CMakeChecker takes unusually long time to run
https://bugs.webkit.org/show_bug.cgi?id=105662
Reviewed by Ryosuke Niwa.
Move the caching mechanism for regular _expression_ of the C++ checker into
a common file and use it for the CMake and ChangeLog checkers too.
* Scripts/webkitpy/style/checkers/changelog.py:
(ChangeLogChecker.check_entry):
* Scripts/webkitpy/style/checkers/cmake.py:
(CMakeChecker._process_line):
(CMakeChecker._check_no_space_cmds):
(CMakeChecker._check_one_space_cmds):
(CMakeChecker._check_non_lowercase_cmd):
* Scripts/webkitpy/style/checkers/common.py:
(match):
(search):
(searchIgnorecase):
(sub):
(subn):
* Scripts/webkitpy/style/checkers/cpp.py:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/style/checkers/changelog.py
trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py
trunk/Tools/Scripts/webkitpy/style/checkers/common.py
trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py
Diff
Modified: trunk/Tools/ChangeLog (156402 => 156403)
--- trunk/Tools/ChangeLog 2013-09-25 16:33:12 UTC (rev 156402)
+++ trunk/Tools/ChangeLog 2013-09-25 17:40:19 UTC (rev 156403)
@@ -1,3 +1,28 @@
+2013-09-25 Patrick Gansterer
+
+CMakeChecker takes unusually long time to run
+https://bugs.webkit.org/show_bug.cgi?id=105662
+
+Reviewed by Ryosuke Niwa.
+
+Move the caching mechanism for regular _expression_ of the C++ checker into
+a common file and use it for the CMake and ChangeLog checkers too.
+
+* Scripts/webkitpy/style/checkers/changelog.py:
+(ChangeLogChecker.check_entry):
+* Scripts/webkitpy/style/checkers/cmake.py:
+(CMakeChecker._process_line):
+(CMakeChecker._check_no_space_cmds):
+(CMakeChecker._check_one_space_cmds):
+(CMakeChecker._check_non_lowercase_cmd):
+* Scripts/webkitpy/style/checkers/common.py:
+(match):
+(search):
+(searchIgnorecase):
+(sub):
+(subn):
+* Scripts/webkitpy/style/checkers/cpp.py:
+
2013-09-25 Allan Sandfeld Jensen
[Qt] Fix build with Qt 5.2 QtPosition module
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/changelog.py (156402 => 156403)
--- trunk/Tools/Scripts/webkitpy/style/checkers/changelog.py 2013-09-25 16:33:12 UTC (rev 156402)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/changelog.py 2013-09-25 17:40:19 UTC (rev 156403)
@@ -23,8 +23,7 @@
"""Checks WebKit style for ChangeLog files."""
-import re
-from common import TabChecker
+from common import TabChecker, match, search, searchIgnorecase
from webkitpy.common.checkout.changelog import parse_bug_id_from_changelog
@@ -45,9 +44,9 @@
for line in entry_lines:
if parse_bug_id_from_changelog(line):
break
-if re.search("Unreviewed", line, re.IGNORECASE):
+if searchIgnorecase("Unreviewed", line):
break
-if re.search("build", line, re.IGNORECASE) and re.search("fix", line, re.IGNORECASE):
+if searchIgnorecase("build", line) and searchIgnorecase("fix", line):
break
else:
self.handle_style_error(first_line_checked,
@@ -58,9 +57,9 @@
for line in entry_lines:
line_no = line_no + 1
# filter file change descriptions
-if not re.match('\s*\*\s', line):
+if not match('\s*\*\s', line):
continue
-if re.search(':\s*$', line) or re.search(':\s', line):
+if search(':\s*$', line) or search(':\s', line):
continue
self.handle_style_error(line_no,
"changelog/filechangedescriptionwhitespace", 5,
@@ -70,7 +69,7 @@
line_no = first_line_checked - 1
for line in entry_lines:
line_no = line_no + 1
-if re.match('\s*No new tests. \(OOPS!\)$', line):
+if match('\s*No new tests. \(OOPS!\)$', line):
self.handle_style_error(line_no,
"changelog/nonewtests", 5,
"You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible.")
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py (156402 => 156403)
--- trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py 2013-09-25 16:33:12 UTC (rev 156402)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py 2013-09-25 17:40:19 UTC (rev 156403)
@@ -24,11 +24,9 @@
"""Supports checking WebKit style in cmake files.(.cmake, CMakeLists.txt)"""
-import re
+from common import TabChecker, match, search, searchIgnorecase
-from common import TabChecker
-
class CMakeChecker(object):
"""Processes CMake lines for checking style."""
@@ -97,16 +95,16 @@
[webkit-changes] [156402] trunk/Source/JavaScriptCore
Title: [156402] trunk/Source/_javascript_Core
Revision 156402
Author par...@webkit.org
Date 2013-09-25 09:33:12 -0700 (Wed, 25 Sep 2013)
Log Message
Build fix for WinCE after r155098.
Windows CE does not support getenv().
* jsc.cpp:
(main):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/jsc.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (156401 => 156402)
--- trunk/Source/_javascript_Core/ChangeLog 2013-09-25 16:32:53 UTC (rev 156401)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-09-25 16:33:12 UTC (rev 156402)
@@ -1,3 +1,12 @@
+2013-09-25 Patrick Gansterer
+
+Build fix for WinCE after r155098.
+
+Windows CE does not support getenv().
+
+* jsc.cpp:
+(main):
+
2013-09-24 Mark Hahnenberg
op_get_callee shouldn't use value profiling
Modified: trunk/Source/_javascript_Core/jsc.cpp (156401 => 156402)
--- trunk/Source/_javascript_Core/jsc.cpp 2013-09-25 16:32:53 UTC (rev 156401)
+++ trunk/Source/_javascript_Core/jsc.cpp 2013-09-25 16:33:12 UTC (rev 156402)
@@ -587,7 +587,8 @@
WTF::initializeMainThread();
#endif
JSC::initializeThreading();
-
+
+#if !OS(WINCE)
if (char* timeoutString = getenv("JSC_timeout")) {
if (sscanf(timeoutString, "%lf", &s_desiredTimeout) != 1) {
dataLog(
@@ -598,6 +599,7 @@
createThread(timeoutThreadMain, 0, "jsc Timeout Thread");
}
}
+#endif
// We can't use destructors in the following code because it uses Windows
// Structured Exception Handling
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156401] trunk/Source/WTF
Title: [156401] trunk/Source/WTF
Revision 156401
Author par...@webkit.org
Date 2013-09-25 09:32:53 -0700 (Wed, 25 Sep 2013)
Log Message
Fix template deduction for CollatorDefault
* wtf/unicode/CollatorDefault.cpp:
(WTF::Collator::userDefault): Use nullptr instead of 0.
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/unicode/CollatorDefault.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (156400 => 156401)
--- trunk/Source/WTF/ChangeLog 2013-09-25 16:08:08 UTC (rev 156400)
+++ trunk/Source/WTF/ChangeLog 2013-09-25 16:32:53 UTC (rev 156401)
@@ -1,3 +1,10 @@
+2013-09-25 Patrick Gansterer
+
+Fix template deduction for CollatorDefault
+
+* wtf/unicode/CollatorDefault.cpp:
+(WTF::Collator::userDefault): Use nullptr instead of 0.
+
2013-09-24 Anders Carlsson
Remove encoder create functions
Modified: trunk/Source/WTF/wtf/unicode/CollatorDefault.cpp (156400 => 156401)
--- trunk/Source/WTF/wtf/unicode/CollatorDefault.cpp 2013-09-25 16:08:08 UTC (rev 156400)
+++ trunk/Source/WTF/wtf/unicode/CollatorDefault.cpp 2013-09-25 16:32:53 UTC (rev 156401)
@@ -47,7 +47,7 @@
OwnPtr Collator::userDefault()
{
-return createOwned(0);
+return createOwned(nullptr);
}
// A default implementation for platforms that lack Unicode-aware collation.
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156321] trunk/Source/WebKit/win
Title: [156321] trunk/Source/WebKit/win
Revision 156321
Author par...@webkit.org
Date 2013-09-24 00:33:35 -0700 (Tue, 24 Sep 2013)
Log Message
Make WebHistory more type safe
https://bugs.webkit.org/show_bug.cgi?id=121801
Reviewed by Brent Fulgham.
Use a WTF::Vector instead of a CFMutableArray to avoid
casting from void* all the time when accessing the entries.
This reduces the dependencies on CoreFoundation too.
* WebHistory.cpp:
(getDayBoundaries):
(beginningOfDay):
(dateKey):
(WebHistory::orderedItemsLastVisitedOnDay):
(WebHistory::removeItemFromDateCaches):
(WebHistory::addItemToDateCaches):
* WebHistory.h:
Modified Paths
trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/WebHistory.cpp
trunk/Source/WebKit/win/WebHistory.h
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (156320 => 156321)
--- trunk/Source/WebKit/win/ChangeLog 2013-09-24 07:30:28 UTC (rev 156320)
+++ trunk/Source/WebKit/win/ChangeLog 2013-09-24 07:33:35 UTC (rev 156321)
@@ -1,3 +1,23 @@
+2013-09-24 Patrick Gansterer
+
+Make WebHistory more type safe
+https://bugs.webkit.org/show_bug.cgi?id=121801
+
+Reviewed by Brent Fulgham.
+
+Use a WTF::Vector instead of a CFMutableArray to avoid
+casting from void* all the time when accessing the entries.
+This reduces the dependencies on CoreFoundation too.
+
+* WebHistory.cpp:
+(getDayBoundaries):
+(beginningOfDay):
+(dateKey):
+(WebHistory::orderedItemsLastVisitedOnDay):
+(WebHistory::removeItemFromDateCaches):
+(WebHistory::addItemToDateCaches):
+* WebHistory.h:
+
2013-09-23 Patrick Gansterer
[WIN] Implement WebMutableURLRequest::setHTTPBody()
Modified: trunk/Source/WebKit/win/WebHistory.cpp (156320 => 156321)
--- trunk/Source/WebKit/win/WebHistory.cpp 2013-09-24 07:30:28 UTC (rev 156320)
+++ trunk/Source/WebKit/win/WebHistory.cpp 2013-09-24 07:33:35 UTC (rev 156321)
@@ -75,6 +75,35 @@
return info;
}
+static void getDayBoundaries(CFAbsoluteTime day, CFAbsoluteTime& beginningOfDay, CFAbsoluteTime& beginningOfNextDay)
+{
+RetainPtr timeZone = adoptCF(CFTimeZoneCopyDefault());
+CFGregorianDate date = CFAbsoluteTimeGetGregorianDate(day, timeZone.get());
+date.hour = 0;
+date.minute = 0;
+date.second = 0;
+beginningOfDay = CFGregorianDateGetAbsoluteTime(date, timeZone.get());
+date.day += 1;
+beginningOfNextDay = CFGregorianDateGetAbsoluteTime(date, timeZone.get());
+}
+
+static inline CFAbsoluteTime beginningOfDay(CFAbsoluteTime date)
+{
+static CFAbsoluteTime cachedBeginningOfDay = std::numeric_limits::quiet_NaN();
+static CFAbsoluteTime cachedBeginningOfNextDay;
+if (!(date >= cachedBeginningOfDay && date < cachedBeginningOfNextDay))
+getDayBoundaries(date, cachedBeginningOfDay, cachedBeginningOfNextDay);
+return cachedBeginningOfDay;
+}
+
+static inline WebHistory::DateKey dateKey(DATE date)
+{
+// Converting from double (CFAbsoluteTime) to int64_t (WebHistoryDateKey) is
+// safe here because all sensible dates are in the range -2**48 .. 2**47 which
+// safely fits in an int64_t.
+return beginningOfDay(MarshallingHelpers::DATEToCFAbsoluteTime(date));
+}
+
// WebHistory -
WebHistory::WebHistory()
@@ -290,20 +319,15 @@
/* [in] */ IWebHistoryItem** items,
/* [in] */ DATE calendarDate)
{
-DateKey dateKey;
-if (!findKey(&dateKey, MarshallingHelpers::DATEToCFAbsoluteTime(calendarDate))) {
+auto found = m_entriesByDate.find(dateKey(calendarDate));
+if (found == m_entriesByDate.end()) {
*count = 0;
return 0;
}
-CFArrayRef entries = m_entriesByDate.get(dateKey).get();
-if (!entries) {
-*count = 0;
-return 0;
-}
+auto& entriesForDate = found->value;
+int newCount = entriesForDate.size();
-int newCount = CFArrayGetCount(entries);
-
if (!items) {
*count = newCount;
return S_OK;
@@ -315,11 +339,8 @@
}
*count = newCount;
-for (int i = 0; i < newCount; i++) {
-IWebHistoryItem* item = (IWebHistoryItem*)CFArrayGetValueAtIndex(entries, i);
-item->AddRef();
-items[i] = item;
-}
+for (int i = 0; i < newCount; ++i)
+entriesForDate[i].copyRefTo(&items[i]);
return S_OK;
}
@@ -564,138 +585,74 @@
return m_entriesByURL.get(urlString);
}
-HRESULT WebHistory::addItemToDateCaches(IWebHistoryItem* entry)
-{
-HRESULT hr = S_OK;
-
-DATE lastVisitedCOMTime;
-entry->lastVisitedTimeInterval(&lastVisitedCOMTime);
-
-DateKey dateKey;
-if (findKey(&dateKey, MarshallingHelpers::DATEToCFAbsoluteTime(lastVisitedCOMTime))) {
-// other entries already exist for this date
-hr = insertItem(entry, dateKey);
-} else {
-ASSERT(!m_entriesByDate.contains(dateKey));
-// no other entries exist for th
[webkit-changes] [156306] trunk/Source/WebCore
Title: [156306] trunk/Source/WebCore
Revision 156306
Author par...@webkit.org
Date 2013-09-23 16:26:23 -0700 (Mon, 23 Sep 2013)
Log Message
[WIN] Add implementation for WebCore::readFromFile()
https://bugs.webkit.org/show_bug.cgi?id=119210
Reviewed by Brent Fulgham.
* platform/win/FileSystemWin.cpp:
(WebCore::readFromFile):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/win/FileSystemWin.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (156305 => 156306)
--- trunk/Source/WebCore/ChangeLog 2013-09-23 22:41:57 UTC (rev 156305)
+++ trunk/Source/WebCore/ChangeLog 2013-09-23 23:26:23 UTC (rev 156306)
@@ -1,5 +1,15 @@
2013-09-23 Patrick Gansterer
+[WIN] Add implementation for WebCore::readFromFile()
+https://bugs.webkit.org/show_bug.cgi?id=119210
+
+Reviewed by Brent Fulgham.
+
+* platform/win/FileSystemWin.cpp:
+(WebCore::readFromFile):
+
+2013-09-23 Patrick Gansterer
+
[WIN] Implement WebMutableURLRequest::setHTTPBody()
https://bugs.webkit.org/show_bug.cgi?id=91920
Modified: trunk/Source/WebCore/platform/win/FileSystemWin.cpp (156305 => 156306)
--- trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2013-09-23 22:41:57 UTC (rev 156305)
+++ trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2013-09-23 23:26:23 UTC (rev 156306)
@@ -384,6 +384,19 @@
return static_cast(bytesWritten);
}
+int readFromFile(PlatformFileHandle handle, char* data, int length)
+{
+if (!isHandleValid(handle))
+return -1;
+
+DWORD bytesRead;
+bool success = ::ReadFile(handle, data, length, &bytesRead, 0);
+
+if (!success)
+return -1;
+return static_cast(bytesRead);
+}
+
bool unloadModule(PlatformModule module)
{
return ::FreeLibrary(module);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156303] trunk/Source
Title: [156303] trunk/Source
Revision 156303
Author par...@webkit.org
Date 2013-09-23 15:35:46 -0700 (Mon, 23 Sep 2013)
Log Message
[WIN] Implement WebMutableURLRequest::setHTTPBody()
https://bugs.webkit.org/show_bug.cgi?id=91920
Reviewed by Brent Fulgham.
Source/WebCore:
Add a method to FormData for growing the internal buffer with a given size.
* platform/network/FormData.cpp:
(WebCore::FormData::appendData):
(WebCore::FormData::expandDataStore):
* platform/network/FormData.h:
Source/WebKit/win:
* WebMutableURLRequest.cpp:
(WebMutableURLRequest::setHTTPBody):
(WebMutableURLRequest::setHTTPBodyStream):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/FormData.cpp
trunk/Source/WebCore/platform/network/FormData.h
trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/WebMutableURLRequest.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (156302 => 156303)
--- trunk/Source/WebCore/ChangeLog 2013-09-23 22:25:25 UTC (rev 156302)
+++ trunk/Source/WebCore/ChangeLog 2013-09-23 22:35:46 UTC (rev 156303)
@@ -1,5 +1,19 @@
2013-09-23 Patrick Gansterer
+[WIN] Implement WebMutableURLRequest::setHTTPBody()
+https://bugs.webkit.org/show_bug.cgi?id=91920
+
+Reviewed by Brent Fulgham.
+
+Add a method to FormData for growing the internal buffer with a given size.
+
+* platform/network/FormData.cpp:
+(WebCore::FormData::appendData):
+(WebCore::FormData::expandDataStore):
+* platform/network/FormData.h:
+
+2013-09-23 Patrick Gansterer
+
use NOMINMAX instead of #define min min
https://bugs.webkit.org/show_bug.cgi?id=73563
Modified: trunk/Source/WebCore/platform/network/FormData.cpp (156302 => 156303)
--- trunk/Source/WebCore/platform/network/FormData.cpp 2013-09-23 22:25:25 UTC (rev 156302)
+++ trunk/Source/WebCore/platform/network/FormData.cpp 2013-09-23 22:35:46 UTC (rev 156303)
@@ -160,12 +160,7 @@
void FormData::appendData(const void* data, size_t size)
{
-if (m_elements.isEmpty() || m_elements.last().m_type != FormDataElement::data)
-m_elements.append(FormDataElement());
-FormDataElement& e = m_elements.last();
-size_t oldSize = e.m_data.size();
-e.m_data.grow(oldSize + size);
-memcpy(e.m_data.data() + oldSize, data, size);
+memcpy(expandDataStore(size), data, size);
}
void FormData::appendFile(const String& filename, bool shouldGenerateFile)
@@ -301,6 +296,16 @@
appendData(encodedData.data(), encodedData.size());
}
+char* FormData::expandDataStore(size_t size)
+{
+if (m_elements.isEmpty() || m_elements.last().m_type != FormDataElement::data)
+m_elements.append(FormDataElement());
+FormDataElement& e = m_elements.last();
+size_t oldSize = e.m_data.size();
+e.m_data.grow(oldSize + size);
+return e.m_data.data() + oldSize;
+}
+
void FormData::flatten(Vector& data) const
{
// Concatenate all the byte arrays, but omit any files.
Modified: trunk/Source/WebCore/platform/network/FormData.h (156302 => 156303)
--- trunk/Source/WebCore/platform/network/FormData.h 2013-09-23 22:25:25 UTC (rev 156302)
+++ trunk/Source/WebCore/platform/network/FormData.h 2013-09-23 22:35:46 UTC (rev 156303)
@@ -130,6 +130,7 @@
void appendURL(const KURL&);
void appendURLRange(const KURL&, long long start, long long length, double expectedModificationTime);
#endif
+char* expandDataStore(size_t);
void flatten(Vector&) const; // omits files
String flattenToString() const; // omits files
Modified: trunk/Source/WebKit/win/ChangeLog (156302 => 156303)
--- trunk/Source/WebKit/win/ChangeLog 2013-09-23 22:25:25 UTC (rev 156302)
+++ trunk/Source/WebKit/win/ChangeLog 2013-09-23 22:35:46 UTC (rev 156303)
@@ -1,5 +1,16 @@
2013-09-23 Patrick Gansterer
+[WIN] Implement WebMutableURLRequest::setHTTPBody()
+https://bugs.webkit.org/show_bug.cgi?id=91920
+
+Reviewed by Brent Fulgham.
+
+* WebMutableURLRequest.cpp:
+(WebMutableURLRequest::setHTTPBody):
+(WebMutableURLRequest::setHTTPBodyStream):
+
+2013-09-23 Patrick Gansterer
+
use NOMINMAX instead of #define min min
https://bugs.webkit.org/show_bug.cgi?id=73563
Modified: trunk/Source/WebKit/win/WebMutableURLRequest.cpp (156302 => 156303)
--- trunk/Source/WebKit/win/WebMutableURLRequest.cpp 2013-09-23 22:25:25 UTC (rev 156302)
+++ trunk/Source/WebKit/win/WebMutableURLRequest.cpp 2013-09-23 22:35:46 UTC (rev 156303)
@@ -286,18 +286,32 @@
return S_OK;
}
-HRESULT STDMETHODCALLTYPE WebMutableURLRequest::setHTTPBody(
-/* [in] */ IStream* /*data*/)
+HRESULT WebMutableURLRequest::setHTTPBody(IStream* data)
{
-ASSERT_NOT_REACHED();
-return E_NOTIMPL;
+if (!data)
+return E_POINTER;
+
+STATSTG stat;
+if (FAILED(data->Stat(&stat, STATFLAG_NONAME)))
+return E_FAIL;
+
+if (stat.cbSize.HighPart || !stat.cbSize.LowPart)
+return
[webkit-changes] [156302] trunk
Title: [156302] trunk Revision 156302 Author par...@webkit.org Date 2013-09-23 15:25:25 -0700 (Mon, 23 Sep 2013) Log Message use NOMINMAX instead of #define min min https://bugs.webkit.org/show_bug.cgi?id=73563 Reviewed by Brent Fulgham. Use NOMINMAX instead of #define min/max as a cleaner way of ensuring that Windows system header files don't define min/max as macro in the first place. Source/_javascript_Core: * config.h: Source/WebCore: * WebCorePrefix.h: * config.h: Source/WebKit/win: * WebKitPrefix.h: Source/WebKit2: * config.h: Source/WTF: * config.h: Tools: * DumpRenderTree/DumpRenderTreePrefix.h: * DumpRenderTree/cg/ImageDiffCG.cpp: * DumpRenderTree/config.h: * DumpRenderTree/win/ImageDiffCairo.cpp: * WebKitTestRunner/WebKitTestRunnerPrefix.h: * WebKitTestRunner/config.h: WebKitLibraries: * win/tools/vsprops/common.props: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/config.h trunk/Source/WTF/ChangeLog trunk/Source/WTF/config.h trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCorePrefix.h trunk/Source/WebCore/config.h trunk/Source/WebKit/win/ChangeLog trunk/Source/WebKit/win/WebKitPrefix.h trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/config.h trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/DumpRenderTreePrefix.h trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp trunk/Tools/DumpRenderTree/config.h trunk/Tools/DumpRenderTree/win/ImageDiffCairo.cpp trunk/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h trunk/Tools/WebKitTestRunner/config.h trunk/WebKitLibraries/ChangeLog trunk/WebKitLibraries/win/tools/vsprops/common.props Diff Modified: trunk/Source/_javascript_Core/ChangeLog (156301 => 156302) --- trunk/Source/_javascript_Core/ChangeLog 2013-09-23 22:16:44 UTC (rev 156301) +++ trunk/Source/_javascript_Core/ChangeLog 2013-09-23 22:25:25 UTC (rev 156302) @@ -1,3 +1,16 @@ +2013-09-23 Patrick Gansterer + +use NOMINMAX instead of #define min min +https://bugs.webkit.org/show_bug.cgi?id=73563 + +Reviewed by Brent Fulgham. + +Use NOMINMAX instead of #define min/max as a cleaner +way of ensuring that Windows system header files don't +define min/max as macro in the first place. + +* config.h: + 2013-09-23 Filip Pizlo Never use ReturnPC for exception handling and quit using exception check indices as a lame replica of the CodeOrigin index Modified: trunk/Source/_javascript_Core/config.h (156301 => 156302) --- trunk/Source/_javascript_Core/config.h 2013-09-23 22:16:44 UTC (rev 156301) +++ trunk/Source/_javascript_Core/config.h 2013-09-23 22:25:25 UTC (rev 156302) @@ -43,11 +43,6 @@ #define WINVER 0x0502 #endif -// If we don't define these, they get defined in windef.h. -// We want to use std::min and std::max -#define max max -#define min min - #if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE) // We need to define this before the first #include of stdlib.h or it won't contain rand_s. #ifndef _CRT_RAND_S Modified: trunk/Source/WTF/ChangeLog (156301 => 156302) --- trunk/Source/WTF/ChangeLog 2013-09-23 22:16:44 UTC (rev 156301) +++ trunk/Source/WTF/ChangeLog 2013-09-23 22:25:25 UTC (rev 156302) @@ -1,3 +1,16 @@ +2013-09-23 Patrick Gansterer + +use NOMINMAX instead of #define min min +https://bugs.webkit.org/show_bug.cgi?id=73563 + +Reviewed by Brent Fulgham. + +Use NOMINMAX instead of #define min/max as a cleaner +way of ensuring that Windows system header files don't +define min/max as macro in the first place. + +* config.h: + 2013-09-23 Anders Carlsson Remove PassTraits.h Modified: trunk/Source/WTF/config.h (156301 => 156302) --- trunk/Source/WTF/config.h 2013-09-23 22:16:44 UTC (rev 156301) +++ trunk/Source/WTF/config.h 2013-09-23 22:25:25 UTC (rev 156302) @@ -40,11 +40,6 @@ #define WINVER 0x0502 #endif -// If we don't define these, they get defined in windef.h. -// We want to use std::min and std::max -#define max max -#define min min - #if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE) // We need to define this before the first #include of stdlib.h or it won't contain rand_s. #ifndef _CRT_RAND_S Modified: trunk/Source/WebCore/ChangeLog (156301 => 156302) --- trunk/Source/WebCore/ChangeLog 2013-09-23 22:16:44 UTC (rev 156301) +++ trunk/Source/WebCore/ChangeLog 2013-09-23 22:25:25 UTC (rev 156302) @@ -1,3 +1,17 @@ +2013-09-23 Patrick Gansterer + +use NOMINMAX instead of #define min min +https://bugs.webkit.org/show_bug.cgi?id=73563 + +Reviewed by Brent Fulgham. + +Use NOMINMAX instead of #define min/max as a cleaner +way of ensuring that Windows system header files don't +define min/max as macro in the first place. + +* WebCorePrefix.h: +* config.h: + 2013-09-23 Simon Fraser REGRESSION (r155998): when zooming in, tiles are too small Modified: trunk/Source/WebCore/WebCorePrefix.h (156301
[webkit-changes] [156266] trunk/Source/WebKit
Title: [156266] trunk/Source/WebKit
Revision 156266
Author par...@webkit.org
Date 2013-09-23 01:09:08 -0700 (Mon, 23 Sep 2013)
Log Message
Cleanup CMake files in WebKit
https://bugs.webkit.org/show_bug.cgi?id=121763
Reviewed by Gyuyoung Kim.
Sort files and unify style.
* PlatformBlackBerry.cmake:
* PlatformEfl.cmake:
* PlatformWinCE.cmake:
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/PlatformBlackBerry.cmake
trunk/Source/WebKit/PlatformEfl.cmake
trunk/Source/WebKit/PlatformWinCE.cmake
Diff
Modified: trunk/Source/WebKit/ChangeLog (156265 => 156266)
--- trunk/Source/WebKit/ChangeLog 2013-09-23 08:07:44 UTC (rev 156265)
+++ trunk/Source/WebKit/ChangeLog 2013-09-23 08:09:08 UTC (rev 156266)
@@ -1,3 +1,16 @@
+2013-09-23 Patrick Gansterer
+
+Cleanup CMake files in WebKit
+https://bugs.webkit.org/show_bug.cgi?id=121763
+
+Reviewed by Gyuyoung Kim.
+
+Sort files and unify style.
+
+* PlatformBlackBerry.cmake:
+* PlatformEfl.cmake:
+* PlatformWinCE.cmake:
+
2013-09-20 Brent Fulgham
[Windows] Unreviewed build fix after r156216.
Modified: trunk/Source/WebKit/PlatformBlackBerry.cmake (156265 => 156266)
--- trunk/Source/WebKit/PlatformBlackBerry.cmake 2013-09-23 08:07:44 UTC (rev 156265)
+++ trunk/Source/WebKit/PlatformBlackBerry.cmake 2013-09-23 08:09:08 UTC (rev 156266)
@@ -70,6 +70,7 @@
blackberry/Api/BackingStore.cpp
blackberry/Api/BlackBerryGlobal.cpp
blackberry/Api/InRegionScroller.cpp
+blackberry/Api/_javascript_Variant.cpp
blackberry/Api/WebAnimation.cpp
blackberry/Api/WebCookieJar.cpp
blackberry/Api/WebKitMIMETypeConverter.cpp
@@ -81,7 +82,7 @@
blackberry/Api/WebPageGroupLoadDeferrer.cpp
blackberry/Api/WebSettings.cpp
blackberry/Api/WebViewportArguments.cpp
-blackberry/Api/_javascript_Variant.cpp
+
blackberry/WebCoreSupport/AutofillManager.cpp
blackberry/WebCoreSupport/BackForwardListBlackBerry.cpp
blackberry/WebCoreSupport/CacheClientBlackBerry.cpp
@@ -97,25 +98,27 @@
blackberry/WebCoreSupport/GeolocationClientBlackBerry.cpp
blackberry/WebCoreSupport/IconDatabaseClientBlackBerry.cpp
blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp
+blackberry/WebCoreSupport/NavigatorContentUtilsClientBlackBerry.cpp
blackberry/WebCoreSupport/NetworkInfoClientBlackBerry.cpp
blackberry/WebCoreSupport/NotificationClientBlackBerry.cpp
blackberry/WebCoreSupport/PlatformStrategiesBlackBerry.cpp
-blackberry/WebCoreSupport/NavigatorContentUtilsClientBlackBerry.cpp
+blackberry/WebCoreSupport/SuggestionBoxElement.cpp
blackberry/WebCoreSupport/SuggestionBoxHandler.cpp
-blackberry/WebCoreSupport/SuggestionBoxElement.cpp
blackberry/WebCoreSupport/VibrationClientBlackBerry.cpp
+
blackberry/WebKitSupport/AboutData.cpp
+blackberry/WebKitSupport/BackingStoreClient.cpp
blackberry/WebKitSupport/BackingStoreTile.cpp
-blackberry/WebKitSupport/BackingStoreClient.cpp
blackberry/WebKitSupport/BackingStoreVisualizationViewportAccessor.cpp
blackberry/WebKitSupport/ColorPickerClient.cpp
+blackberry/WebKitSupport/DOMSupport.cpp
blackberry/WebKitSupport/DatePickerClient.cpp
blackberry/WebKitSupport/DefaultTapHighlight.cpp
-blackberry/WebKitSupport/DOMSupport.cpp
+blackberry/WebKitSupport/FatFingers.cpp
blackberry/WebKitSupport/FrameLayers.cpp
blackberry/WebKitSupport/InPageSearchManager.cpp
+blackberry/WebKitSupport/InRegionScrollableArea.cpp
blackberry/WebKitSupport/InputHandler.cpp
-blackberry/WebKitSupport/InRegionScrollableArea.cpp
blackberry/WebKitSupport/InspectorOverlayBlackBerry.cpp
blackberry/WebKitSupport/NotificationManager.cpp
blackberry/WebKitSupport/PagePopup.cpp
@@ -128,7 +131,6 @@
blackberry/WebKitSupport/SpellingHandler.cpp
blackberry/WebKitSupport/SurfacePool.cpp
blackberry/WebKitSupport/TouchEventHandler.cpp
-blackberry/WebKitSupport/FatFingers.cpp
blackberry/WebKitSupport/WebKitThreadViewportAccessor.cpp
)
@@ -147,25 +149,28 @@
if (NOT PUBLIC_BUILD)
# DumpRenderTree sources
list(APPEND WebKit_SOURCES
-blackberry/WebKitSupport/DumpRenderTreeSupport.cpp
+${TOOLS_DIR}/DumpRenderTree/AccessibilityController.cpp
+${TOOLS_DIR}/DumpRenderTree/AccessibilityTextMarker.cpp
+${TOOLS_DIR}/DumpRenderTree/AccessibilityUIElement.cpp
+${TOOLS_DIR}/DumpRenderTree/CyclicRedundancyCheck.cpp
+${TOOLS_DIR}/DumpRenderTree/GCController.cpp
+${TOOLS_DIR}/DumpRenderTree/PixelDumpSupport.cpp
+${TOOLS_DIR}/DumpRenderTree/TestRunner.cpp
+${TOOLS_DIR}/DumpRenderTree/WorkQueue.cpp
+
${TOOLS_DIR}/DumpRenderTree/blackberry/AccessibilityControllerBlackBerry.cpp
${TOOLS_DIR}/DumpRenderTree/blackberry/AccessibilityUIElementBlackBerry.cpp
${TOOLS_DIR}/DumpRenderTree/blackberry/DumpRenderTree.cpp
$
[webkit-changes] [156265] trunk/Source/WebKit2
Title: [156265] trunk/Source/WebKit2 Revision 156265 Author par...@webkit.org Date 2013-09-23 01:07:44 -0700 (Mon, 23 Sep 2013) Log Message Cleanup CMake files in WebKit2 https://bugs.webkit.org/show_bug.cgi?id=121767 Reviewed by Gyuyoung Kim. Sort files and unify style. * CMakeLists.txt: * PlatformEfl.cmake: * PlatformGTK.cmake: Modified Paths trunk/Source/WebKit2/CMakeLists.txt trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/PlatformEfl.cmake trunk/Source/WebKit2/PlatformGTK.cmake Diff Modified: trunk/Source/WebKit2/CMakeLists.txt (156264 => 156265) --- trunk/Source/WebKit2/CMakeLists.txt 2013-09-23 08:03:38 UTC (rev 156264) +++ trunk/Source/WebKit2/CMakeLists.txt 2013-09-23 08:07:44 UTC (rev 156265) @@ -235,10 +235,16 @@ Shared/API/c/WKURLResponse.cpp Shared/API/c/WKUserContentURLPattern.cpp +Shared/Authentication/AuthenticationManager.cpp + Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp Shared/CoordinatedGraphics/WebCustomFilterProgramProxy.cpp +Shared/Downloads/Download.cpp +Shared/Downloads/DownloadAuthenticationClient.cpp +Shared/Downloads/DownloadManager.cpp + Shared/Plugins/NPIdentifierData.cpp Shared/Plugins/NPObjectMessageReceiver.cpp Shared/Plugins/NPObjectProxy.cpp @@ -257,7 +263,6 @@ UIProcess/FindIndicator.cpp UIProcess/GeolocationPermissionRequestManagerProxy.cpp UIProcess/GeolocationPermissionRequestProxy.cpp - UIProcess/ResponsivenessTimer.cpp UIProcess/StatisticsRequest.cpp UIProcess/TextCheckerCompletion.cpp @@ -295,7 +300,6 @@ UIProcess/WebIconDatabaseClient.cpp UIProcess/WebInspectorProxy.cpp UIProcess/WebKeyValueStorageManager.cpp - UIProcess/WebLoaderClient.cpp UIProcess/WebMediaCacheManagerProxy.cpp UIProcess/WebNavigationData.cpp @@ -399,16 +403,10 @@ WebProcess/ApplicationCache/WebApplicationCacheManager.cpp -Shared/Authentication/AuthenticationManager.cpp - WebProcess/Battery/WebBatteryManager.cpp WebProcess/Cookies/WebCookieManager.cpp -Shared/Downloads/Download.cpp -Shared/Downloads/DownloadAuthenticationClient.cpp -Shared/Downloads/DownloadManager.cpp - WebProcess/FullScreen/WebFullScreenManager.cpp WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp @@ -423,8 +421,8 @@ WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp -WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp +WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.cpp @@ -531,10 +529,11 @@ Shared/WebConnection.messages.in +Shared/Authentication/AuthenticationManager.messages.in + Shared/Plugins/NPObjectMessageReceiver.messages.in UIProcess/DrawingAreaProxy.messages.in -UIProcess/Storage/StorageManager.messages.in UIProcess/WebApplicationCacheManagerProxy.messages.in UIProcess/WebBatteryManagerProxy.messages.in UIProcess/WebContext.messages.in @@ -551,21 +550,20 @@ UIProcess/WebResourceCacheManagerProxy.messages.in UIProcess/WebVibrationProxy.messages.in - UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.messages.in UIProcess/Downloads/DownloadProxy.messages.in +UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in + UIProcess/Plugins/PluginProcessProxy.messages.in -UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in +UIProcess/Storage/StorageManager.messages.in WebProcess/WebProcess.messages.in WebProcess/ApplicationCache/WebApplicationCacheManager.messages.in -Shared/Authentication/AuthenticationManager.messages.in - WebProcess/Battery/WebBatteryManager.messages.in WebProcess/Cookies/WebCookieManager.messages.in Modified: trunk/Source/WebKit2/ChangeLog (156264 => 156265) --- trunk/Source/WebKit2/ChangeLog 2013-09-23 08:03:38 UTC (rev 156264) +++ trunk/Source/WebKit2/ChangeLog 2013-09-23 08:07:44 UTC (rev 156265) @@ -1,3 +1,16 @@ +2013-09-23 Patrick Gansterer + +Cleanup CMake files in WebKit2 +https://bugs.webkit.org/show_bug.cgi?id=121767 + +Reviewed by Gyuyoung Kim. + +Sort files and unify style. + +* CMakeLists.txt: +* PlatformEfl.cmake: +* PlatformGTK.cmake: + 2013-09-21 Darin Adler Add ExecState::uncheckedArgument and use where possible to shrink a bit Modified: trunk/Source/WebKit2/PlatformEfl.cmake (156264 => 156265) --- trunk/Source/Web
[webkit-changes] [156264] trunk/Source/WTF
Title: [156264] trunk/Source/WTF
Revision 156264
Author par...@webkit.org
Date 2013-09-23 01:03:38 -0700 (Mon, 23 Sep 2013)
Log Message
Cleanup CMake files in WTF
https://bugs.webkit.org/show_bug.cgi?id=121761
Reviewed by Gyuyoung Kim.
Sort files and unify the style.
* wtf/CMakeLists.txt:
* wtf/PlatformEfl.cmake:
* wtf/PlatformGTK.cmake:
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/CMakeLists.txt
trunk/Source/WTF/wtf/PlatformEfl.cmake
trunk/Source/WTF/wtf/PlatformGTK.cmake
Diff
Modified: trunk/Source/WTF/ChangeLog (156263 => 156264)
--- trunk/Source/WTF/ChangeLog 2013-09-23 08:02:57 UTC (rev 156263)
+++ trunk/Source/WTF/ChangeLog 2013-09-23 08:03:38 UTC (rev 156264)
@@ -1,3 +1,16 @@
+2013-09-23 Patrick Gansterer
+
+Cleanup CMake files in WTF
+https://bugs.webkit.org/show_bug.cgi?id=121761
+
+Reviewed by Gyuyoung Kim.
+
+Sort files and unify the style.
+
+* wtf/CMakeLists.txt:
+* wtf/PlatformEfl.cmake:
+* wtf/PlatformGTK.cmake:
+
2013-09-22 Andreas Kling
Give purity hints to compiler to avoid penalizing repeated calls to some functions.
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (156263 => 156264)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2013-09-23 08:02:57 UTC (rev 156263)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2013-09-23 08:03:38 UTC (rev 156264)
@@ -14,8 +14,8 @@
Compression.h
CryptographicallyRandomNumber.h
CurrentTime.h
+DataLog.h
DateMath.h
-DataLog.h
DecimalNumber.h
Decoder.h
DeferrableRefCounted.h
@@ -52,11 +52,8 @@
MessageQueue.h
MetaAllocator.h
MetaAllocatorHandle.h
-ThreadRestrictionVerifier.h
-Ref.h
Noncopyable.h
NumberOfCores.h
-RAMSize.h
OSAllocator.h
OSRandomSource.h
OwnPtr.h
@@ -65,29 +62,31 @@
PageAllocationAligned.h
PageBlock.h
PageReservation.h
-PassOwnPtr.h
-PassRefPtr.h
-PassTraits.h
ParallelJobs.h
ParallelJobsGeneric.h
ParallelJobsLibdispatch.h
ParallelJobsOpenMP.h
+PassOwnPtr.h
+PassRefPtr.h
+PassTraits.h
Platform.h
PossiblyNull.h
PrintStream.h
ProcessID.h
+RAMSize.h
RandomNumber.h
RandomNumberSeed.h
RawPointer.h
RedBlackTree.h
+Ref.h
RefCounted.h
RefCountedLeakCounter.h
RefPtr.h
RefPtrHashMap.h
RetainPtr.h
+SHA1.h
SaturatedArithmetic.h
SegmentedVector.h
-SHA1.h
StackBounds.h
StaticConstructors.h
StdLibExtras.h
@@ -99,6 +98,7 @@
TCSpinLock.h
TCSystemAlloc.h
ThreadIdentifierDataPthreads.h
+ThreadRestrictionVerifier.h
ThreadSafeRefCounted.h
ThreadSpecific.h
Threading.h
@@ -149,8 +149,8 @@
Compression.cpp
CryptographicallyRandomNumber.cpp
CurrentTime.cpp
+DataLog.cpp
DateMath.cpp
-DataLog.cpp
DecimalNumber.cpp
DynamicAnnotations.cpp
FastMalloc.cpp
@@ -162,13 +162,13 @@
MainThread.cpp
MediaTime.cpp
MetaAllocator.cpp
+NumberOfCores.cpp
OSRandomSource.cpp
-NumberOfCores.cpp
-RAMSize.cpp
PageAllocationAligned.cpp
PageBlock.cpp
ParallelJobsGeneric.cpp
PrintStream.cpp
+RAMSize.cpp
RandomNumber.cpp
RefCountedLeakCounter.cpp
SHA1.cpp
@@ -237,6 +237,7 @@
)
list(APPEND WTF_SOURCES
unicode/CollatorDefault.cpp
+
unicode/wchar/UnicodeWchar.cpp
)
endif ()
Modified: trunk/Source/WTF/wtf/PlatformEfl.cmake (156263 => 156264)
--- trunk/Source/WTF/wtf/PlatformEfl.cmake 2013-09-23 08:02:57 UTC (rev 156263)
+++ trunk/Source/WTF/wtf/PlatformEfl.cmake 2013-09-23 08:03:38 UTC (rev 156264)
@@ -8,17 +8,17 @@
)
list(APPEND WTF_LIBRARIES
-pthread
-${ZLIB_LIBRARIES}
-${GLIB_LIBRARIES}
-${GLIB_GIO_LIBRARIES}
-${GLIB_GOBJECT_LIBRARIES}
-${ECORE_LIBRARIES}
${ECORE_EVAS_LIBRARIES}
${ECORE_IMF_LIBRARIES}
+${ECORE_LIBRARIES}
${EINA_LIBRARIES}
${EO_LIBRARIES}
${EVAS_LIBRARIES}
+${GLIB_GIO_LIBRARIES}
+${GLIB_GOBJECT_LIBRARIES}
+${GLIB_LIBRARIES}
+${ZLIB_LIBRARIES}
+pthread
)
list(APPEND WTF_INCLUDE_DIRECTORIES
Modified: trunk/Source/WTF/wtf/PlatformGTK.cmake (156263 => 156264)
--- trunk/Source/WTF/wtf/PlatformGTK.cmake 2013-09-23 08:02:57 UTC (rev 156263)
+++ trunk/Source/WTF/wtf/PlatformGTK.cmake 2013-09-23 08:03:38 UTC (rev 156264)
@@ -1,16 +1,16 @@
list(APPEND WTF_SOURCES
-gobject/GlibUtilities.cpp
gobject/GOwnPtr.cpp
gobject/GRefPtr.cpp
+gobject/GlibUtilities.cpp
gtk/MainThreadGtk.cpp
)
list(APPEND WTF_LIBRARIES
-pthread
-${GLIB_LIBRARIES}
${GLIB_GIO_LIBRARIES}
${GLIB_GOBJECT_LIBRARIES}
+${GLIB_LIBRARIES}
+pthread
)
list(APPEND WTF_INCLUDE_DIRECTORIES
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156263] trunk/Source/JavaScriptCore
Title: [156263] trunk/Source/_javascript_Core
Revision 156263
Author par...@webkit.org
Date 2013-09-23 01:02:57 -0700 (Mon, 23 Sep 2013)
Log Message
Cleanup CMake files in _javascript_Core
https://bugs.webkit.org/show_bug.cgi?id=121762
Reviewed by Gyuyoung Kim.
Sort files and unify style.
* CMakeLists.txt:
* shell/CMakeLists.txt:
* shell/PlatformBlackBerry.cmake:
* shell/PlatformEfl.cmake:
Modified Paths
trunk/Source/_javascript_Core/CMakeLists.txt
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/shell/CMakeLists.txt
trunk/Source/_javascript_Core/shell/PlatformBlackBerry.cmake
trunk/Source/_javascript_Core/shell/PlatformEfl.cmake
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (156262 => 156263)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2013-09-23 06:35:47 UTC (rev 156262)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2013-09-23 08:02:57 UTC (rev 156263)
@@ -40,8 +40,8 @@
API/JSWeakObjectMapRefPrivate.cpp
API/OpaqueJSString.cpp
-assembler/MacroAssembler.cpp
assembler/LinkBuffer.cpp
+assembler/MacroAssembler.cpp
assembler/MacroAssemblerX86Common.cpp
bytecode/ArrayAllocationProfile.cpp
@@ -76,6 +76,10 @@
bytecompiler/BytecodeGenerator.cpp
bytecompiler/NodesCodegen.cpp
+debugger/Debugger.cpp
+debugger/DebuggerActivation.cpp
+debugger/DebuggerCallFrame.cpp
+
dfg/DFGAbstractHeap.cpp
dfg/DFGAbstractValue.cpp
dfg/DFGArgumentsSimplificationPhase.cpp
@@ -197,10 +201,6 @@
heap/WeakSet.cpp
heap/WriteBarrierSupport.cpp
-debugger/Debugger.cpp
-debugger/DebuggerActivation.cpp
-debugger/DebuggerCallFrame.cpp
-
interpreter/AbstractPC.cpp
interpreter/CallFrame.cpp
interpreter/Interpreter.cpp
@@ -241,6 +241,10 @@
parser/SourceProvider.cpp
parser/SourceProviderCache.cpp
+profiler/LegacyProfiler.cpp
+profiler/Profile.cpp
+profiler/ProfileGenerator.cpp
+profiler/ProfileNode.cpp
profiler/ProfilerBytecode.cpp
profiler/ProfilerBytecodeSequence.cpp
profiler/ProfilerBytecodes.cpp
@@ -248,15 +252,11 @@
profiler/ProfilerCompilationKind.cpp
profiler/ProfilerCompiledBytecode.cpp
profiler/ProfilerDatabase.cpp
-profiler/ProfilerOrigin.cpp
-profiler/ProfilerOriginStack.cpp
profiler/ProfilerOSRExit.cpp
profiler/ProfilerOSRExitSite.cpp
+profiler/ProfilerOrigin.cpp
+profiler/ProfilerOriginStack.cpp
profiler/ProfilerProfiledBytecodes.cpp
-profiler/Profile.cpp
-profiler/ProfileGenerator.cpp
-profiler/ProfileNode.cpp
-profiler/LegacyProfiler.cpp
runtime/ArgList.cpp
runtime/Arguments.cpp
@@ -405,9 +405,9 @@
tools/CodeProfiling.cpp
yarr/YarrCanonicalizeUCS2.cpp
-yarr/YarrPattern.cpp
yarr/YarrInterpreter.cpp
yarr/YarrJIT.cpp
+yarr/YarrPattern.cpp
yarr/YarrSyntaxChecker.cpp
)
@@ -567,23 +567,22 @@
set(_javascript_Core_FORWARDING_HEADERS_FILES
API/APICast.h
API/APIShims.h
-API/_javascript_.h
API/JSBase.h
API/JSCTestRunnerUtils.h
API/JSContextRef.h
API/JSContextRefPrivate.h
API/JSObjectRef.h
API/JSObjectRefPrivate.h
+API/JSRetainPtr.h
API/JSScriptRefPrivate.h
API/JSStringRef.h
-API/JSStringRefCF.h
API/JSStringRefBSTR.h
+API/JSStringRefCF.h
API/JSValueRef.h
-API/_javascript_Core.h
-API/JSRetainPtr.h
API/JSWeakObjectMapRefInternal.h
API/JSWeakObjectMapRefPrivate.h
-API/JSRetainPtr.h
+API/_javascript_.h
+API/_javascript_Core.h
API/OpaqueJSString.h
API/WebKitAvailability.h
)
Modified: trunk/Source/_javascript_Core/ChangeLog (156262 => 156263)
--- trunk/Source/_javascript_Core/ChangeLog 2013-09-23 06:35:47 UTC (rev 156262)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-09-23 08:02:57 UTC (rev 156263)
@@ -1,3 +1,17 @@
+2013-09-23 Patrick Gansterer
+
+Cleanup CMake files in _javascript_Core
+https://bugs.webkit.org/show_bug.cgi?id=121762
+
+Reviewed by Gyuyoung Kim.
+
+Sort files and unify style.
+
+* CMakeLists.txt:
+* shell/CMakeLists.txt:
+* shell/PlatformBlackBerry.cmake:
+* shell/PlatformEfl.cmake:
+
2013-09-22 Filip Pizlo
Get rid of CodeBlock::RareData::callReturnIndexVector and most of the evil that it introduced
Modified: trunk/Source/_javascript_Core/shell/CMakeLists.txt (156262 => 156263)
--- trunk/Source/_javascript_Core/shell/CMakeLists.txt 2013-09-23 06:35:47 UTC (rev 156262)
+++ trunk/Source/_javascript_Core/shell/CMakeLists.txt 2013-09-23 08:02:57 UTC (rev 156263)
@@ -3,9 +3,9 @@
)
set(JSC_LIBRARIES
+${CMAKE_DL_LIBS}
+_javascript_Core
WTF
-_javascript_Core
-${CMAKE_DL_LIBS}
)
if ("${_javascript_Core_LIBRARY_TYPE}" MATCHES "STATIC")
Modified: trunk/Source/_javascript_Core/shell/PlatformBlackBerry.cmake (156262 => 156263)
--- trunk/Source/_javascript_Core/shell/PlatformBlackBerry.c
[webkit-changes] [156228] trunk/Source/WebCore
Title: [156228] trunk/Source/WebCore
Revision 156228
Author par...@webkit.org
Date 2013-09-21 06:45:10 -0700 (Sat, 21 Sep 2013)
Log Message
Handle windows lineendings in makeprop.pl after r155511
https://bugs.webkit.org/show_bug.cgi?id=121740
Reviewed by Ryosuke Niwa.
Check for an optinal \r at the end of a line in regular expressions
to make it work again on native windows machines which use CRLF.
* css/makeprop.pl:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/makeprop.pl
Diff
Modified: trunk/Source/WebCore/ChangeLog (156227 => 156228)
--- trunk/Source/WebCore/ChangeLog 2013-09-21 13:05:56 UTC (rev 156227)
+++ trunk/Source/WebCore/ChangeLog 2013-09-21 13:45:10 UTC (rev 156228)
@@ -1,3 +1,15 @@
+2013-09-21 Patrick Gansterer
+
+Handle windows lineendings in makeprop.pl after r155511
+https://bugs.webkit.org/show_bug.cgi?id=121740
+
+Reviewed by Ryosuke Niwa.
+
+Check for an optinal \r at the end of a line in regular expressions
+to make it work again on native windows machines which use CRLF.
+
+* css/makeprop.pl:
+
2013-09-21 Andreas Kling
Re-inline some hot ElementData functions.
Modified: trunk/Source/WebCore/css/makeprop.pl (156227 => 156228)
--- trunk/Source/WebCore/css/makeprop.pl 2013-09-21 13:05:56 UTC (rev 156227)
+++ trunk/Source/WebCore/css/makeprop.pl 2013-09-21 13:45:10 UTC (rev 156228)
@@ -47,7 +47,7 @@
next if (/^#/);
# Input may use a different EOL sequence than $/, so avoid chomp.
- $_ =~ s/\s*\[(.+?)\]$//;
+ $_ =~ s/\s*\[(.+?)\]\r?$//;
my @options = ();
if ($1) {
@options = split(/\s*,\s*/, $1);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156177] trunk/Tools
Title: [156177] trunk/Tools
Revision 156177
Author par...@webkit.org
Date 2013-09-20 10:16:56 -0700 (Fri, 20 Sep 2013)
Log Message
Nuke remaining VS2005 tools from the tree.
https://bugs.webkit.org/show_bug.cgi?id=121691
Reviewed by Brent Fulgham.
* CLWrapper/CLWrapper.cpp: Removed.
* CLWrapper/CLWrapper.sln: Removed.
* CLWrapper/CLWrapper.vcproj: Removed.
* MIDLWrapper/MIDLWrapper.cpp: Removed.
* MIDLWrapper/MIDLWrapper.sln: Removed.
* MIDLWrapper/MIDLWrapper.vcproj: Removed.
* Scripts/parallelcl: Removed.
* vcbin/cl.exe: Removed.
* vcbin/midl.exe: Removed.
Modified Paths
trunk/Tools/ChangeLog
Removed Paths
trunk/Tools/CLWrapper/
trunk/Tools/MIDLWrapper/
trunk/Tools/Scripts/parallelcl
trunk/Tools/vcbin/
Diff
Modified: trunk/Tools/ChangeLog (156176 => 156177)
--- trunk/Tools/ChangeLog 2013-09-20 17:16:01 UTC (rev 156176)
+++ trunk/Tools/ChangeLog 2013-09-20 17:16:56 UTC (rev 156177)
@@ -1,3 +1,20 @@
+2013-09-20 Patrick Gansterer
+
+Nuke remaining VS2005 tools from the tree.
+https://bugs.webkit.org/show_bug.cgi?id=121691
+
+Reviewed by Brent Fulgham.
+
+* CLWrapper/CLWrapper.cpp: Removed.
+* CLWrapper/CLWrapper.sln: Removed.
+* CLWrapper/CLWrapper.vcproj: Removed.
+* MIDLWrapper/MIDLWrapper.cpp: Removed.
+* MIDLWrapper/MIDLWrapper.sln: Removed.
+* MIDLWrapper/MIDLWrapper.vcproj: Removed.
+* Scripts/parallelcl: Removed.
+* vcbin/cl.exe: Removed.
+* vcbin/midl.exe: Removed.
+
2013-09-20 Mario Sanchez Prada
[GTK] socket_embed_hook hitting NULL-check assertion running TestWebKit2
Deleted: trunk/Tools/Scripts/parallelcl (156176 => 156177)
--- trunk/Tools/Scripts/parallelcl 2013-09-20 17:16:01 UTC (rev 156176)
+++ trunk/Tools/Scripts/parallelcl 2013-09-20 17:16:56 UTC (rev 156177)
@@ -1,224 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-use File::Basename;
-use File::Spec;
-use File::Temp;
-use POSIX;
-
-sub makeJob(\@$);
-sub forkAndCompileFiles(\@$);
-sub Exec($);
-sub waitForChild(\@);
-sub cleanup(\@);
-
-my $debug = 0;
-
-chomp(my $clexe = `cygpath -u '$ENV{'VS80COMNTOOLS'}/../../VC/bin/cl.exe'`);
-
-if ($debug) {
-print STDERR "Received " . @ARGV . " arguments:\n";
-foreach my $arg (@ARGV) {
-print STDERR "$arg\n";
-}
-}
-
-my $commandFile;
-foreach my $arg (@ARGV) {
-if ($arg =~ /^[\/-](E|EP|P)$/) {
-print STDERR "The invoking process wants preprocessed source, so let's hand off this whole command to the real cl.exe\n" if $debug;
-Exec("\"$clexe\" \"" . join('" "', @ARGV) . "\"");
-} elsif ($arg =~ /^@(.*)$/) {
-chomp($commandFile = `cygpath -u '$1'`);
-}
-}
-
-die "No command file specified!" unless $commandFile;
-die "Couldn't find $commandFile!" unless -f $commandFile;
-
-my @sources;
-
-open(COMMAND, '<:raw:encoding(UTF16-LE):crlf:utf8', $commandFile) or die "Couldn't open $commandFile!";
-
-# The first line of the command file contains all the options to cl.exe plus the first (possibly quoted) filename
-my $firstLine = ;
-$firstLine =~ s/\r?\n$//;
-
-# To find the start of the first filename, look for either the last space on the line.
-# If the filename is quoted, the last character on the line will be a quote, so look for the quote before that.
-my $firstFileIndex;
-print STDERR "Last character of first line = '" . substr($firstLine, -1, 1) . "'\n" if $debug;
-if (substr($firstLine, -1, 1) eq '"') {
-print STDERR "First file is quoted\n" if $debug;
-$firstFileIndex = rindex($firstLine, '"', length($firstLine) - 2);
-} else {
-print STDERR "First file is NOT quoted\n" if $debug;
-$firstFileIndex = rindex($firstLine, ' ') + 1;
-}
-
-my $options = substr($firstLine, 0, $firstFileIndex) . join(' ', @ARGV[1 .. $#ARGV]);
-my $possibleFirstFile = substr($firstLine, $firstFileIndex);
-if ($possibleFirstFile =~ /\.(cpp|c)/) {
-push(@sources, $possibleFirstFile);
-} else {
-$options .= " $possibleFirstFile";
-}
-
-print STDERR " Found options $options ##\n" if $debug;
-print STDERR "### Found first source file $sources[0] \n" if @sources && $debug;
-
-# The rest of the lines of the command file just contain source files, one per line
-while (my $source = ) {
-chomp($source);
-$source =~ s/^\s+//;
-$source =~ s/\s+$//;
-push(@sources, $source) if length($source);
-}
-close(COMMAND);
-
-my $numSources = @sources;
-exit unless $numSources > 0;
-
-my $numJobs;
-if ($options =~ s/-j\s*([0-9]+)//) {
-$numJobs = $1;
-} else {
-chomp($numJobs = `num-cpus`);
-}
-
-print STDERR "\n\n### COMPILING $numSources FILES USING AT MOST $numJobs PARALLEL INSTANCES OF cl.exe ###\n\n";# if $debug;
-
-# Magic determination of job size
-# The hope is that by splitting the source files up into 2*$numJobs pieces, we
-# won't suffer too much if one job finishes much more quickly than another.
-# However, we don't want to split it up too much du
[webkit-changes] [156181] trunk/Source/WebCore
Title: [156181] trunk/Source/WebCore Revision 156181 Author par...@webkit.org Date 2013-09-20 10:44:47 -0700 (Fri, 20 Sep 2013) Log Message Fix the build after r156144 * html/canvas/CanvasRenderingContext2D.cpp: Added missing include. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (156180 => 156181) --- trunk/Source/WebCore/ChangeLog 2013-09-20 17:32:18 UTC (rev 156180) +++ trunk/Source/WebCore/ChangeLog 2013-09-20 17:44:47 UTC (rev 156181) @@ -1,3 +1,9 @@ +2013-09-20 Patrick Gansterer + +Fix the build after r156144 + +* html/canvas/CanvasRenderingContext2D.cpp: Added missing include. + 2013-09-20 Ryosuke Niwa renderStyleOfEnclosingTextNode should update style before using a renderer Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (156180 => 156181) --- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2013-09-20 17:32:18 UTC (rev 156180) +++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2013-09-20 17:44:47 UTC (rev 156181) @@ -51,6 +51,7 @@ #include "HTMLMediaElement.h" #include "HTMLVideoElement.h" #include "ImageData.h" +#include "RenderElement.h" #include "SecurityOrigin.h" #include "StrokeStyleApplier.h" #include "StylePropertySet.h" ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156171] trunk/Source/WebKit/win
Title: [156171] trunk/Source/WebKit/win Revision 156171 Author par...@webkit.org Date 2013-09-20 09:45:51 -0700 (Fri, 20 Sep 2013) Log Message Fix MIDL files for Visual Studio 2012 https://bugs.webkit.org/show_bug.cgi?id=121552 Reviewed by Brent Fulgham. The MIDL compiler shipped with Visual Studio 2012 does not accept forward declarations with typedefs. Use the struct keyword in the function signature to fix this problem. * Interfaces/DOMPrivate.idl: Modified Paths trunk/Source/WebKit/win/ChangeLog trunk/Source/WebKit/win/Interfaces/DOMPrivate.idl Diff Modified: trunk/Source/WebKit/win/ChangeLog (156170 => 156171) --- trunk/Source/WebKit/win/ChangeLog 2013-09-20 16:45:42 UTC (rev 156170) +++ trunk/Source/WebKit/win/ChangeLog 2013-09-20 16:45:51 UTC (rev 156171) @@ -1,5 +1,17 @@ 2013-09-20 Patrick Gansterer +Fix MIDL files for Visual Studio 2012 +https://bugs.webkit.org/show_bug.cgi?id=121552 + +Reviewed by Brent Fulgham. + +The MIDL compiler shipped with Visual Studio 2012 does not accept forward declarations +with typedefs. Use the struct keyword in the function signature to fix this problem. + +* Interfaces/DOMPrivate.idl: + +2013-09-20 Patrick Gansterer + Remove duplicated secondsPerDay variables https://bugs.webkit.org/show_bug.cgi?id=121601 Modified: trunk/Source/WebKit/win/Interfaces/DOMPrivate.idl (156170 => 156171) --- trunk/Source/WebKit/win/Interfaces/DOMPrivate.idl 2013-09-20 16:45:42 UTC (rev 156170) +++ trunk/Source/WebKit/win/Interfaces/DOMPrivate.idl 2013-09-20 16:45:51 UTC (rev 156171) @@ -31,8 +31,6 @@ interface IDOMElement; -typedef struct WebFontDescription WebFontDescription; - [ object, oleautomation, @@ -45,7 +43,7 @@ HRESULT isEqual([in] IDOMElement* other, [out, retval] BOOL* result); HRESULT isFocused([out, retval] BOOL* result); HRESULT innerText([out, retval] BSTR* result); -[local] HRESULT font(WebFontDescription* webFontDescription); +[local] HRESULT font(struct WebFontDescription* webFontDescription); HRESULT renderedImage([out, retval] HBITMAP* image); [local] HRESULT markerTextForListItem([out, retval] BSTR* markerText); [local] HRESULT shadowPseudoId([out, retval] BSTR* result); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156159] trunk/Source
Title: [156159] trunk/Source
Revision 156159
Author par...@webkit.org
Date 2013-09-20 06:23:25 -0700 (Fri, 20 Sep 2013)
Log Message
[CMake] Use COMPILE_DEFINITIONS target property for setting BUILDING_* defines
https://bugs.webkit.org/show_bug.cgi?id=121672
Reviewed by Gyuyoung Kim.
Since the scope of add_definitions() is always a whole file, we need to use
target properties instead to set definitions only for specific targets.
Source/_javascript_Core:
* CMakeLists.txt:
Source/WebCore:
* CMakeLists.txt:
Source/WebKit:
* CMakeLists.txt:
Source/WTF:
* wtf/CMakeLists.txt:
Modified Paths
trunk/Source/_javascript_Core/CMakeLists.txt
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/CMakeLists.txt
trunk/Source/WebCore/CMakeLists.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebKit/CMakeLists.txt
trunk/Source/WebKit/ChangeLog
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (156158 => 156159)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2013-09-20 13:17:07 UTC (rev 156158)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2013-09-20 13:23:25 UTC (rev 156159)
@@ -664,9 +664,10 @@
WEBKIT_WRAP_SOURCELIST(${_javascript_Core_SOURCES})
include_directories(${_javascript_Core_INCLUDE_DIRECTORIES})
-add_definitions(-DBUILDING_JavaScriptCore -DSTATICALLY_LINKED_WITH_WTF)
+add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
add_library(_javascript_Core ${_javascript_Core_LIBRARY_TYPE} ${_javascript_Core_HEADERS} ${_javascript_Core_SOURCES})
target_link_libraries(_javascript_Core ${_javascript_Core_LIBRARIES})
+set_target_properties(_javascript_Core PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")
set_target_properties(_javascript_Core PROPERTIES FOLDER "_javascript_Core")
set_target_properties(_javascript_Core PROPERTIES LINK_INTERFACE_LIBRARIES "")
Modified: trunk/Source/_javascript_Core/ChangeLog (156158 => 156159)
--- trunk/Source/_javascript_Core/ChangeLog 2013-09-20 13:17:07 UTC (rev 156158)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-09-20 13:23:25 UTC (rev 156159)
@@ -1,3 +1,15 @@
+2013-09-20 Patrick Gansterer
+
+[CMake] Use COMPILE_DEFINITIONS target property for setting BUILDING_* defines
+https://bugs.webkit.org/show_bug.cgi?id=121672
+
+Reviewed by Gyuyoung Kim.
+
+Since the scope of add_definitions() is always a whole file, we need to use
+target properties instead to set definitions only for specific targets.
+
+* CMakeLists.txt:
+
2013-09-19 Commit Queue
Unreviewed, rolling out r156120.
Modified: trunk/Source/WTF/ChangeLog (156158 => 156159)
--- trunk/Source/WTF/ChangeLog 2013-09-20 13:17:07 UTC (rev 156158)
+++ trunk/Source/WTF/ChangeLog 2013-09-20 13:23:25 UTC (rev 156159)
@@ -1,5 +1,17 @@
2013-09-20 Patrick Gansterer
+[CMake] Use COMPILE_DEFINITIONS target property for setting BUILDING_* defines
+https://bugs.webkit.org/show_bug.cgi?id=121672
+
+Reviewed by Gyuyoung Kim.
+
+Since the scope of add_definitions() is always a whole file, we need to use
+target properties instead to set definitions only for specific targets.
+
+* wtf/CMakeLists.txt:
+
+2013-09-20 Patrick Gansterer
+
Remove duplicated secondsPerDay variables
https://bugs.webkit.org/show_bug.cgi?id=121601
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (156158 => 156159)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2013-09-20 13:17:07 UTC (rev 156158)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2013-09-20 13:23:25 UTC (rev 156159)
@@ -262,9 +262,9 @@
WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
include_directories(${WTF_INCLUDE_DIRECTORIES})
-add_definitions(-DBUILDING_WTF)
add_library(WTF STATIC ${WTF_HEADERS} ${WTF_SOURCES})
target_link_libraries(WTF ${WTF_LIBRARIES})
+set_target_properties(WTF PROPERTIES COMPILE_DEFINITIONS "BUILDING_WTF")
set_target_properties(WTF PROPERTIES FOLDER "_javascript_Core")
if (WTF_OUTPUT_NAME)
Modified: trunk/Source/WebCore/CMakeLists.txt (156158 => 156159)
--- trunk/Source/WebCore/CMakeLists.txt 2013-09-20 13:17:07 UTC (rev 156158)
+++ trunk/Source/WebCore/CMakeLists.txt 2013-09-20 13:23:25 UTC (rev 156159)
@@ -3214,10 +3214,10 @@
WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES})
-add_definitions(-DBUILDING_WebCore)
include_directories(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES})
add_library(WebCore ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
+set_target_properties(WebCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_WebCore")
set_target_properties(WebCore PROPERTIES FOLDER "WebCore")
set_target_properties(WebCore PROPERTIES LINK_INTERFACE_LIBRARIES "")
Modified: trunk/Source/WebCore/ChangeLog (156158 => 156159)
--- trunk/Source/WebCore/ChangeLog 2013-09-20 13:17:07 UTC (rev 156158)
+++ trunk/Source/WebCore/ChangeLog 2013-09-20 13:23
[webkit-changes] [156154] trunk/Source
Title: [156154] trunk/Source
Revision 156154
Author par...@webkit.org
Date 2013-09-20 04:56:30 -0700 (Fri, 20 Sep 2013)
Log Message
Remove duplicated secondsPerDay variables
https://bugs.webkit.org/show_bug.cgi?id=121601
Reviewed by Andreas Kling.
Source/WebCore:
Use secondsPerDay from DateMath.h instead of defining it again.
* history/HistoryItem.cpp:
(WebCore::timeToDay):
Source/WebKit/win:
Use secondsPerDay from DateMath.h instead of defining it again.
* MarshallingHelpers.cpp:
Source/WTF:
Move secondsPerDay from the source into the header file
to make it accessible by other code too.
* wtf/DateMath.cpp:
* wtf/DateMath.h:
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/DateMath.cpp
trunk/Source/WTF/wtf/DateMath.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/history/HistoryItem.cpp
trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/MarshallingHelpers.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (156153 => 156154)
--- trunk/Source/WTF/ChangeLog 2013-09-20 11:54:46 UTC (rev 156153)
+++ trunk/Source/WTF/ChangeLog 2013-09-20 11:56:30 UTC (rev 156154)
@@ -1,3 +1,16 @@
+2013-09-20 Patrick Gansterer
+
+Remove duplicated secondsPerDay variables
+https://bugs.webkit.org/show_bug.cgi?id=121601
+
+Reviewed by Andreas Kling.
+
+Move secondsPerDay from the source into the header file
+to make it accessible by other code too.
+
+* wtf/DateMath.cpp:
+* wtf/DateMath.h:
+
2013-09-19 Joseph Pecoraro
ASSERTs in isMainThread after USE(WEB_THREAD) MainThread changes
Modified: trunk/Source/WTF/wtf/DateMath.cpp (156153 => 156154)
--- trunk/Source/WTF/wtf/DateMath.cpp 2013-09-20 11:54:46 UTC (rev 156153)
+++ trunk/Source/WTF/wtf/DateMath.cpp 2013-09-20 11:56:30 UTC (rev 156154)
@@ -114,7 +114,6 @@
/* Constants */
static const double minutesPerDay = 24.0 * 60.0;
-static const double secondsPerDay = 24.0 * 60.0 * 60.0;
static const double secondsPerYear = 24.0 * 60.0 * 60.0 * 365.0;
static const double usecPerSec = 100.0;
Modified: trunk/Source/WTF/wtf/DateMath.h (156153 => 156154)
--- trunk/Source/WTF/wtf/DateMath.h 2013-09-20 11:54:46 UTC (rev 156153)
+++ trunk/Source/WTF/wtf/DateMath.h 2013-09-20 11:56:30 UTC (rev 156154)
@@ -103,13 +103,14 @@
const double hoursPerDay = 24.0;
const double minutesPerHour = 60.0;
-const double secondsPerHour = 60.0 * 60.0;
const double secondsPerMinute = 60.0;
const double msPerSecond = 1000.0;
-const double msPerMinute = 60.0 * 1000.0;
-const double msPerHour = 60.0 * 60.0 * 1000.0;
-const double msPerDay = 24.0 * 60.0 * 60.0 * 1000.0;
const double msPerMonth = 259200.0;
+const double secondsPerHour = secondsPerMinute * minutesPerHour;
+const double secondsPerDay = secondsPerHour * hoursPerDay;
+const double msPerMinute = msPerSecond * secondsPerMinute;
+const double msPerHour = msPerSecond * secondsPerHour;
+const double msPerDay = msPerSecond * secondsPerDay;
WTF_EXPORT_PRIVATE bool isLeapYear(int year);
@@ -143,6 +144,7 @@
using WTF::msToDays;
using WTF::msToMinutes;
using WTF::msToHours;
+using WTF::secondsPerDay;
using WTF::secondsPerMinute;
using WTF::parseDateFromNullTerminatedCharacters;
using WTF::makeRFC2822DateString;
Modified: trunk/Source/WebCore/ChangeLog (156153 => 156154)
--- trunk/Source/WebCore/ChangeLog 2013-09-20 11:54:46 UTC (rev 156153)
+++ trunk/Source/WebCore/ChangeLog 2013-09-20 11:56:30 UTC (rev 156154)
@@ -1,5 +1,17 @@
2013-09-20 Patrick Gansterer
+Remove duplicated secondsPerDay variables
+https://bugs.webkit.org/show_bug.cgi?id=121601
+
+Reviewed by Andreas Kling.
+
+Use secondsPerDay from DateMath.h instead of defining it again.
+
+* history/HistoryItem.cpp:
+(WebCore::timeToDay):
+
+2013-09-20 Patrick Gansterer
+
Fix duplicated loop variable names after r155743
https://bugs.webkit.org/show_bug.cgi?id=121667
Modified: trunk/Source/WebCore/history/HistoryItem.cpp (156153 => 156154)
--- trunk/Source/WebCore/history/HistoryItem.cpp 2013-09-20 11:54:46 UTC (rev 156153)
+++ trunk/Source/WebCore/history/HistoryItem.cpp 2013-09-20 11:56:30 UTC (rev 156154)
@@ -35,6 +35,7 @@
#include "SharedBuffer.h"
#include
#include
+#include
#include
#include
#include
@@ -319,7 +320,6 @@
static inline int timeToDay(double time)
{
-static const double secondsPerDay = 60 * 60 * 24;
return static_cast(ceil(time / secondsPerDay));
}
Modified: trunk/Source/WebKit/win/ChangeLog (156153 => 156154)
--- trunk/Source/WebKit/win/ChangeLog 2013-09-20 11:54:46 UTC (rev 156153)
+++ trunk/Source/WebKit/win/ChangeLog 2013-09-20 11:56:30 UTC (rev 156154)
@@ -1,3 +1,14 @@
+2013-09-20 Patrick Gansterer
+
+Remove duplicated secondsPerDay variables
+https://bugs.webkit.org/show_bug.cgi?id=121601
+
+Reviewed by Andreas Kling.
+
+Use secondsPerDay from DateMath.h instead of defining it again.
+
[webkit-changes] [156153] trunk/Source/WebCore
Title: [156153] trunk/Source/WebCore
Revision 156153
Author par...@webkit.org
Date 2013-09-20 04:54:46 -0700 (Fri, 20 Sep 2013)
Log Message
Fix duplicated loop variable names after r155743
https://bugs.webkit.org/show_bug.cgi?id=121667
Reviewed by Andreas Kling.
Do not use the same name for variables in nested loops to fix a compiler warning.
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (156152 => 156153)
--- trunk/Source/WebCore/ChangeLog 2013-09-20 11:51:19 UTC (rev 156152)
+++ trunk/Source/WebCore/ChangeLog 2013-09-20 11:54:46 UTC (rev 156153)
@@ -1,3 +1,15 @@
+2013-09-20 Patrick Gansterer
+
+Fix duplicated loop variable names after r155743
+https://bugs.webkit.org/show_bug.cgi?id=121667
+
+Reviewed by Andreas Kling.
+
+Do not use the same name for variables in nested loops to fix a compiler warning.
+
+* page/animation/CSSPropertyAnimation.cpp:
+(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+
2013-09-20 Antti Koivisto
Make RenderObject::parent() return RenderElement
Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (156152 => 156153)
--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2013-09-20 11:51:19 UTC (rev 156152)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2013-09-20 11:54:46 UTC (rev 156153)
@@ -1352,8 +1352,8 @@
Vector longhandWrappers;
longhandWrappers.reserveInitialCapacity(shorthand.length());
const CSSPropertyID* properties = shorthand.properties();
-for (unsigned i = 0; i < shorthand.length(); ++i) {
-unsigned wrapperIndex = indexFromPropertyID(properties[i]);
+for (unsigned j = 0; j < shorthand.length(); ++j) {
+unsigned wrapperIndex = indexFromPropertyID(properties[j]);
if (wrapperIndex == cInvalidPropertyWrapperIndex)
continue;
ASSERT(m_propertyWrappers[wrapperIndex]);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156146] trunk/Source/WebCore
Title: [156146] trunk/Source/WebCore
Revision 156146
Author par...@webkit.org
Date 2013-09-20 02:52:13 -0700 (Fri, 20 Sep 2013)
Log Message
Buildfix for ENABLE(CSS_FILTERS) && !ENABLE(ACCELERATED_COMPOSITING) after r155131.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::enclosingFilterRepaintLayer):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderLayer.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (156145 => 156146)
--- trunk/Source/WebCore/ChangeLog 2013-09-20 09:51:53 UTC (rev 156145)
+++ trunk/Source/WebCore/ChangeLog 2013-09-20 09:52:13 UTC (rev 156146)
@@ -1,5 +1,12 @@
2013-09-20 Patrick Gansterer
+Buildfix for ENABLE(CSS_FILTERS) && !ENABLE(ACCELERATED_COMPOSITING) after r155131.
+
+* rendering/RenderLayer.cpp:
+(WebCore::RenderLayer::enclosingFilterRepaintLayer):
+
+2013-09-20 Patrick Gansterer
+
[WIN] Fix build without precompiled header after r154146.
* platform/win/WebCoreBundleWin.cpp:
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (156145 => 156146)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-09-20 09:51:53 UTC (rev 156145)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-09-20 09:52:13 UTC (rev 156146)
@@ -1484,7 +1484,12 @@
RenderLayer* RenderLayer::enclosingFilterRepaintLayer() const
{
for (const RenderLayer* curr = this; curr; curr = curr->parent()) {
-if ((curr != this && curr->requiresFullLayerImageForFilters()) || compositedWithOwnBackingStore(curr) || curr->isRootLayer())
+if ((curr != this && curr->requiresFullLayerImageForFilters())
+#if USE(ACCELERATED_COMPOSITING)
+|| compositedWithOwnBackingStore(curr)
+#endif
+|| curr->isRootLayer()
+)
return const_cast(curr);
}
return 0;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156145] trunk/Source/WebCore
Title: [156145] trunk/Source/WebCore
Revision 156145
Author par...@webkit.org
Date 2013-09-20 02:51:53 -0700 (Fri, 20 Sep 2013)
Log Message
[WIN] Fix build without precompiled header after r154146.
* platform/win/WebCoreBundleWin.cpp:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/win/WebCoreBundleWin.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (156144 => 156145)
--- trunk/Source/WebCore/ChangeLog 2013-09-20 08:59:25 UTC (rev 156144)
+++ trunk/Source/WebCore/ChangeLog 2013-09-20 09:51:53 UTC (rev 156145)
@@ -1,3 +1,9 @@
+2013-09-20 Patrick Gansterer
+
+[WIN] Fix build without precompiled header after r154146.
+
+* platform/win/WebCoreBundleWin.cpp:
+
2013-09-20 Antti Koivisto
Add covariant RenderElement* Element::renderer()
Modified: trunk/Source/WebCore/platform/win/WebCoreBundleWin.cpp (156144 => 156145)
--- trunk/Source/WebCore/platform/win/WebCoreBundleWin.cpp 2013-09-20 08:59:25 UTC (rev 156144)
+++ trunk/Source/WebCore/platform/win/WebCoreBundleWin.cpp 2013-09-20 09:51:53 UTC (rev 156145)
@@ -30,6 +30,7 @@
#include "WebCoreInstanceHandle.h"
#include
+#include
#include
namespace WebCore {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [156051] trunk/Source/WebKit/win
Title: [156051] trunk/Source/WebKit/win
Revision 156051
Author par...@webkit.org
Date 2013-09-18 10:32:29 -0700 (Wed, 18 Sep 2013)
Log Message
Make WebHistory more type safe
https://bugs.webkit.org/show_bug.cgi?id=119389
Reviewed by Brent Fulgham.
Use a WTF::HashMap instead of a CFMutableDictionary to avoid
casting from void* all the time when accessing the entries.
This reduces the dependencies on CoreFoundation too.
* WebHistory.cpp:
(WebHistory::WebHistory):
(WebHistory::removeAllItems):
(WebHistory::allItems):
(WebHistory::removeItem):
(WebHistory::addItem):
(WebHistory::visitedURL):
(WebHistory::itemForURL):
(WebHistory::removeItemForURLString):
(WebHistory::itemForURLString):
(WebHistory::addVisitedLinksToPageGroup):
* WebHistory.h:
Modified Paths
trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/WebHistory.cpp
trunk/Source/WebKit/win/WebHistory.h
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (156050 => 156051)
--- trunk/Source/WebKit/win/ChangeLog 2013-09-18 17:27:08 UTC (rev 156050)
+++ trunk/Source/WebKit/win/ChangeLog 2013-09-18 17:32:29 UTC (rev 156051)
@@ -1,3 +1,27 @@
+2013-09-18 Patrick Gansterer
+
+Make WebHistory more type safe
+https://bugs.webkit.org/show_bug.cgi?id=119389
+
+Reviewed by Brent Fulgham.
+
+Use a WTF::HashMap instead of a CFMutableDictionary to avoid
+casting from void* all the time when accessing the entries.
+This reduces the dependencies on CoreFoundation too.
+
+* WebHistory.cpp:
+(WebHistory::WebHistory):
+(WebHistory::removeAllItems):
+(WebHistory::allItems):
+(WebHistory::removeItem):
+(WebHistory::addItem):
+(WebHistory::visitedURL):
+(WebHistory::itemForURL):
+(WebHistory::removeItemForURLString):
+(WebHistory::itemForURLString):
+(WebHistory::addVisitedLinksToPageGroup):
+* WebHistory.h:
+
2013-09-17 Brent Fulgham
[Windows] Speculative build fix after r155963
Modified: trunk/Source/WebKit/win/WebHistory.cpp (156050 => 156051)
--- trunk/Source/WebKit/win/WebHistory.cpp 2013-09-18 17:27:08 UTC (rev 156050)
+++ trunk/Source/WebKit/win/WebHistory.cpp 2013-09-18 17:32:29 UTC (rev 156051)
@@ -84,8 +84,6 @@
gClassCount++;
gClassNameCount.add("WebHistory");
-m_entriesByURL = adoptCF(CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &MarshallingHelpers::kIUnknownDictionaryValueCallBacks));
-
m_preferences = WebPreferences::sharedStandardPreferences();
}
@@ -244,12 +242,12 @@
m_entriesByDate.clear();
m_orderedLastVisitedDays.clear();
-CFIndex itemCount = CFDictionaryGetCount(m_entriesByURL.get());
-Vector itemsVector(itemCount);
-CFDictionaryGetKeysAndValues(m_entriesByURL.get(), 0, (const void**)itemsVector.data());
-RetainPtr allItems = adoptCF(CFArrayCreate(kCFAllocatorDefault, (const void**)itemsVector.data(), itemCount, &MarshallingHelpers::kIUnknownArrayCallBacks));
+Vector itemsVector(m_entriesByURL.size());
+for (auto it = m_entriesByURL.begin(); it != m_entriesByURL.end(); ++it)
+itemsVector.append(it->value.get());
+RetainPtr allItems = adoptCF(CFArrayCreate(kCFAllocatorDefault, (const void**)itemsVector.data(), itemsVector.size(), &MarshallingHelpers::kIUnknownArrayCallBacks));
-CFDictionaryRemoveAllValues(m_entriesByURL.get());
+m_entriesByURL.clear();
PageGroup::removeAllVisitedLinks();
@@ -330,7 +328,7 @@
/* [out][in] */ int* count,
/* [out][retval] */ IWebHistoryItem** items)
{
-int entriesByURLCount = CFDictionaryGetCount(m_entriesByURL.get());
+int entriesByURLCount = m_entriesByURL.size();
if (!items) {
*count = entriesByURLCount;
@@ -343,9 +341,11 @@
}
*count = entriesByURLCount;
-CFDictionaryGetKeysAndValues(m_entriesByURL.get(), 0, (const void**)items);
-for (int i = 0; i < entriesByURLCount; i++)
+int i = 0;
+for (auto it = m_entriesByURL.begin(); it != m_entriesByURL.end(); ++i, ++it) {
+items[i] = it->value.get();
items[i]->AddRef();
+}
return S_OK;
}
@@ -403,16 +403,19 @@
if (FAILED(hr))
return hr;
-RetainPtr urlString = adoptCF(MarshallingHelpers::BSTRToCFStringRef(urlBStr));
+String urlString(urlBStr, SysStringLen(urlBStr));
+auto it = m_entriesByURL.find(urlString);
+if (it == m_entriesByURL.end())
+return E_FAIL;
+
// If this exact object isn't stored, then make no change.
// FIXME: Is this the right behavior if this entry isn't present, but another entry for the same URL is?
// Maybe need to change the API to make something like removeEntryForURLString public instead.
-IWebHistoryItem *matchingEntry = (IWebHistoryItem*)CFDictionaryGetValue(m_entriesByURL.get(), urlString.get());
-if (matchingEntry != entry)
+if (it->value.get() != entry)
return E_FAIL;
-hr = removeItemForURLS
[webkit-changes] [155830] trunk/Source/WebKit/win
Title: [155830] trunk/Source/WebKit/win
Revision 155830
Author par...@webkit.org
Date 2013-09-15 18:01:11 -0700 (Sun, 15 Sep 2013)
Log Message
Remove dependency on CoreFoundation from WebIconDatabase
https://bugs.webkit.org/show_bug.cgi?id=119387
Reviewed by Brent Fulgham.
* COMVariantSetter.h:
(COMVariant::operator&):
(COMVariant::operator->):
* WebIconDatabase.cpp:
(WebIconDatabase::iconDatabaseNotificationUserInfoURLKey):
(postDidAddIconNotification):
* WebIconDatabase.h:
* WebView.cpp:
(WebView::notifyDidAddIcon):
Modified Paths
trunk/Source/WebKit/win/COMVariantSetter.h
trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/WebIconDatabase.cpp
trunk/Source/WebKit/win/WebIconDatabase.h
trunk/Source/WebKit/win/WebView.cpp
Diff
Modified: trunk/Source/WebKit/win/COMVariantSetter.h (155829 => 155830)
--- trunk/Source/WebKit/win/COMVariantSetter.h 2013-09-16 00:45:50 UTC (rev 155829)
+++ trunk/Source/WebKit/win/COMVariantSetter.h 2013-09-16 01:01:11 UTC (rev 155830)
@@ -165,6 +165,16 @@
return *this;
}
+VARIANT* operator&()
+{
+return &m_variant;
+}
+
+VARIANT* operator->()
+{
+return &m_variant;
+}
+
void copyTo(VARIANT* dest) const
{
::VariantCopy(dest, const_cast(&m_variant));
Modified: trunk/Source/WebKit/win/ChangeLog (155829 => 155830)
--- trunk/Source/WebKit/win/ChangeLog 2013-09-16 00:45:50 UTC (rev 155829)
+++ trunk/Source/WebKit/win/ChangeLog 2013-09-16 01:01:11 UTC (rev 155830)
@@ -1,3 +1,20 @@
+2013-09-15 Patrick Gansterer
+
+Remove dependency on CoreFoundation from WebIconDatabase
+https://bugs.webkit.org/show_bug.cgi?id=119387
+
+Reviewed by Brent Fulgham.
+
+* COMVariantSetter.h:
+(COMVariant::operator&):
+(COMVariant::operator->):
+* WebIconDatabase.cpp:
+(WebIconDatabase::iconDatabaseNotificationUserInfoURLKey):
+(postDidAddIconNotification):
+* WebIconDatabase.h:
+* WebView.cpp:
+(WebView::notifyDidAddIcon):
+
2013-09-11 Brent Fulgham
[Windows] Avoid converting from IntSize->SIZE->IntSize
Modified: trunk/Source/WebKit/win/WebIconDatabase.cpp (155829 => 155830)
--- trunk/Source/WebKit/win/WebIconDatabase.cpp 2013-09-16 00:45:50 UTC (rev 155829)
+++ trunk/Source/WebKit/win/WebIconDatabase.cpp 2013-09-16 01:01:11 UTC (rev 155830)
@@ -27,7 +27,7 @@
#include "WebKitDLL.h"
#include "WebIconDatabase.h"
-#include "CFDictionaryPropertyBag.h"
+#include "COMPropertyBag.h"
#include "WebNotificationCenter.h"
#include "WebPreferences.h"
#include "shlobj.h"
@@ -372,9 +372,9 @@
return didAddIconName;
}
-CFStringRef WebIconDatabase::iconDatabaseNotificationUserInfoURLKey()
+BSTR WebIconDatabase::iconDatabaseNotificationUserInfoURLKey()
{
-static CFStringRef iconUserInfoURLKey = String(WebIconNotificationUserInfoURLKey).createCFString().leakRef();
+static BSTR iconUserInfoURLKey = SysAllocString(WebIconNotificationUserInfoURLKey);
return iconUserInfoURLKey;
}
@@ -392,14 +392,10 @@
static void postDidAddIconNotification(const String& pageURL, WebIconDatabase* iconDB)
{
-RetainPtr dictionary = adoptCF(
-CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+HashMap dictionary;
+dictionary.set(WebIconDatabase::iconDatabaseNotificationUserInfoURLKey(), pageURL);
+COMPtr userInfo(AdoptCOM, COMPropertyBag::adopt(dictionary));
-CFDictionaryAddValue(dictionary.get(), WebIconDatabase::iconDatabaseNotificationUserInfoURLKey(), pageURL.createCFString().get());
-
-COMPtr userInfo = CFDictionaryPropertyBag::createInstance();
-userInfo->setDictionary(dictionary.get());
-
IWebNotificationCenter* notifyCenter = WebNotificationCenter::defaultCenterInternal();
notifyCenter->postNotificationName(WebIconDatabase::iconDatabaseDidAddIconNotification(), static_cast(iconDB), userInfo.get());
}
Modified: trunk/Source/WebKit/win/WebIconDatabase.h (155829 => 155830)
--- trunk/Source/WebKit/win/WebIconDatabase.h 2013-09-16 00:45:50 UTC (rev 155829)
+++ trunk/Source/WebKit/win/WebIconDatabase.h 2013-09-16 01:01:11 UTC (rev 155830)
@@ -36,8 +36,6 @@
#include
-typedef const struct __CFString * CFStringRef;
-
namespace WebCore
{
class IconDatabase;
@@ -112,7 +110,7 @@
static BSTR iconDatabaseDidAddIconNotification();
static BSTR iconDatabaseDidRemoveAllIconsNotification();
-static CFStringRef iconDatabaseNotificationUserInfoURLKey();
+static BSTR iconDatabaseNotificationUserInfoURLKey();
protected:
ULONG m_refCount;
static WebIconDatabase* m_sharedWebIconDatabase;
Modified: trunk/Source/WebKit/win/WebView.cpp (155829 => 155830)
--- trunk/Source/WebKit/win/WebView.cpp 2013-09-16 00:45:50 UTC (rev 155829)
+++ trunk/Source/WebKit/win/WebView.cpp 2013-09-16 01:01:11 UTC (rev 155830)
@@ -28,7 +28,7 @@
#include "config.h"
#include "WebView.h"
-#include
[webkit-changes] [155829] trunk/Source/WTF
Title: [155829] trunk/Source/WTF
Revision 155829
Author par...@webkit.org
Date 2013-09-15 17:45:50 -0700 (Sun, 15 Sep 2013)
Log Message
Fix build with Visual Studio 2012 after r153764.
https://bugs.webkit.org/show_bug.cgi?id=121406
Reviewed by Brent Fulgham.
* wtf/MathExtras.h:
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/MathExtras.h
Diff
Modified: trunk/Source/WTF/ChangeLog (155828 => 155829)
--- trunk/Source/WTF/ChangeLog 2013-09-16 00:02:38 UTC (rev 155828)
+++ trunk/Source/WTF/ChangeLog 2013-09-16 00:45:50 UTC (rev 155829)
@@ -1,3 +1,12 @@
+2013-09-15 Patrick Gansterer
+
+Fix build with Visual Studio 2012 after r153764.
+https://bugs.webkit.org/show_bug.cgi?id=121406
+
+Reviewed by Brent Fulgham.
+
+* wtf/MathExtras.h:
+
2013-09-15 Alberto Garcia
Unreviewed GTK gardening.
Modified: trunk/Source/WTF/wtf/MathExtras.h (155828 => 155829)
--- trunk/Source/WTF/wtf/MathExtras.h 2013-09-16 00:02:38 UTC (rev 155828)
+++ trunk/Source/WTF/wtf/MathExtras.h 2013-09-16 00:45:50 UTC (rev 155829)
@@ -144,7 +144,7 @@
inline long lroundf(float num) { return static_cast(roundf(num)); }
inline double trunc(double num) { return num > 0 ? floor(num) : ceil(num); }
-#if defined(_MSC_VER) && (_MSC_VER <= 1600)
+#if _MSC_VER < 1800
inline double remainder(double numerator, double denominator)
{
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [155828] trunk/Source/WebCore
Title: [155828] trunk/Source/WebCore
Revision 155828
Author par...@webkit.org
Date 2013-09-15 17:02:38 -0700 (Sun, 15 Sep 2013)
Log Message
[WIN] Fix build without precompiled header after r154146.
* platform/win/WebCoreBundleWin.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/win/WebCoreBundleWin.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (155827 => 155828)
--- trunk/Source/WebCore/ChangeLog 2013-09-15 21:07:34 UTC (rev 155827)
+++ trunk/Source/WebCore/ChangeLog 2013-09-16 00:02:38 UTC (rev 155828)
@@ -1,3 +1,9 @@
+2013-09-15 Patrick Gansterer
+
+[WIN] Fix build without precompiled header after r154146.
+
+* platform/win/WebCoreBundleWin.h:
+
2013-09-15 Andreas Kling
CTTE: EllipsisBox owner renderer is always a RenderBlock.
Modified: trunk/Source/WebCore/platform/win/WebCoreBundleWin.h (155827 => 155828)
--- trunk/Source/WebCore/platform/win/WebCoreBundleWin.h 2013-09-15 21:07:34 UTC (rev 155827)
+++ trunk/Source/WebCore/platform/win/WebCoreBundleWin.h 2013-09-16 00:02:38 UTC (rev 155828)
@@ -28,6 +28,8 @@
#if USE(CF)
+typedef struct __CFBundle* CFBundleRef;
+
namespace WebCore {
CFBundleRef webKitBundle();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [155812] trunk/Source/WTF
Title: [155812] trunk/Source/WTF Revision 155812 Author par...@webkit.org Date 2013-09-15 07:58:35 -0700 (Sun, 15 Sep 2013) Log Message [WIN] Fix build without precompiled header after r155454. * wtf/win/GDIObject.h: Added missing windows.h include. Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/win/GDIObject.h Diff Modified: trunk/Source/WTF/ChangeLog (155811 => 155812) --- trunk/Source/WTF/ChangeLog 2013-09-15 14:13:55 UTC (rev 155811) +++ trunk/Source/WTF/ChangeLog 2013-09-15 14:58:35 UTC (rev 155812) @@ -1,3 +1,9 @@ +2013-09-15 Patrick Gansterer + +[WIN] Fix build without precompiled header after r155454. + +* wtf/win/GDIObject.h: Added missing windows.h include. + 2013-09-15 Andreas Kling Remove Ref(const T&) constructor. Modified: trunk/Source/WTF/wtf/win/GDIObject.h (155811 => 155812) --- trunk/Source/WTF/wtf/win/GDIObject.h 2013-09-15 14:13:55 UTC (rev 155811) +++ trunk/Source/WTF/wtf/win/GDIObject.h 2013-09-15 14:58:35 UTC (rev 155812) @@ -29,6 +29,7 @@ #include #include #include +#include #include #include ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [155556] trunk/Source/WebCore
Title: [16] trunk/Source/WebCore Revision 16 Author par...@webkit.org Date 2013-09-11 13:18:15 -0700 (Wed, 11 Sep 2013) Log Message Fix animations with !USE(ACCELERATED_COMPOSITING) after r147792. https://bugs.webkit.org/show_bug.cgi?id=121159 Reviewed by Simon Fraser. CSSPropertyAnimation::blendProperties() is available always and needs to be called to make the animations work. * page/animation/ImplicitAnimation.cpp: (WebCore::ImplicitAnimation::animate): * page/animation/KeyframeAnimation.cpp: (WebCore::KeyframeAnimation::animate): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (15 => 16) --- trunk/Source/WebCore/ChangeLog 2013-09-11 19:50:03 UTC (rev 15) +++ trunk/Source/WebCore/ChangeLog 2013-09-11 20:18:15 UTC (rev 16) @@ -1,3 +1,18 @@ +2013-09-11 Patrick Gansterer + +Fix animations with !USE(ACCELERATED_COMPOSITING) after r147792. +https://bugs.webkit.org/show_bug.cgi?id=121159 + +Reviewed by Simon Fraser. + +CSSPropertyAnimation::blendProperties() is available always +and needs to be called to make the animations work. + +* page/animation/ImplicitAnimation.cpp: +(WebCore::ImplicitAnimation::animate): +* page/animation/KeyframeAnimation.cpp: +(WebCore::KeyframeAnimation::animate): + 2013-09-11 David Hyatt Move all collapsing margin code out of RenderBlock and into RenderBlockFlow. Modified: trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp (15 => 16) --- trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2013-09-11 19:50:03 UTC (rev 15) +++ trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2013-09-11 20:18:15 UTC (rev 16) @@ -77,10 +77,10 @@ if (!animatedStyle) animatedStyle = RenderStyle::clone(targetStyle); -#if USE(ACCELERATED_COMPOSITING) bool needsAnim = CSSPropertyAnimation::blendProperties(this, m_animatingProperty, animatedStyle.get(), m_fromStyle.get(), m_toStyle.get(), progress(1, 0, 0)); // FIXME: we also need to detect cases where we have to software animate for other reasons, // such as a child using inheriting the transform. https://bugs.webkit.org/show_bug.cgi?id=23902 +#if USE(ACCELERATED_COMPOSITING) if (!needsAnim) // If we are running an accelerated animation, set a flag in the style which causes the style // to compare as different to any other style. This ensures that changes to the property Modified: trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp (15 => 16) --- trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2013-09-11 19:50:03 UTC (rev 15) +++ trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2013-09-11 20:18:15 UTC (rev 16) @@ -184,8 +184,9 @@ const RenderStyle* toStyle = 0; double progress = 0.0; fetchIntervalEndpointsForProperty(*it, fromStyle, toStyle, progress); + +bool needsAnim = CSSPropertyAnimation::blendProperties(this, *it, animatedStyle.get(), fromStyle, toStyle, progress); #if USE(ACCELERATED_COMPOSITING) -bool needsAnim = CSSPropertyAnimation::blendProperties(this, *it, animatedStyle.get(), fromStyle, toStyle, progress); if (!needsAnim) // If we are running an accelerated animation, set a flag in the style // to indicate it. This can be used to make sure we get an updated ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [155521] trunk
Title: [155521] trunk
Revision 155521
Author par...@webkit.org
Date 2013-09-11 06:44:29 -0700 (Wed, 11 Sep 2013)
Log Message
[CMake] Split out generic Windows files into its own file
https://bugs.webkit.org/show_bug.cgi?id=119514
Reviewed by Gyuyoung Kim.
This allows us to add smaller CMakeLists.txt files when
adding additional Windows ports.
.:
* Source/cmake/OptionsWinCE.cmake:
* Source/cmake/WebKitMacros.cmake:
Source/WebCore:
* PlatformWin.cmake: Copied from Source/WebCore/PlatformWinCE.cmake.
* PlatformWinCE.cmake:
Source/WTF:
* wtf/PlatformWin.cmake: Renamed from Source/WTF/wtf/PlatformWinCE.cmake.
Modified Paths
trunk/ChangeLog
trunk/Source/WTF/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/PlatformWinCE.cmake
trunk/Source/cmake/OptionsWinCE.cmake
trunk/Source/cmake/WebKitMacros.cmake
Added Paths
trunk/Source/WTF/wtf/PlatformWin.cmake
trunk/Source/WebCore/PlatformWin.cmake
Removed Paths
trunk/Source/WTF/wtf/PlatformWinCE.cmake
Diff
Modified: trunk/ChangeLog (155520 => 155521)
--- trunk/ChangeLog 2013-09-11 12:05:10 UTC (rev 155520)
+++ trunk/ChangeLog 2013-09-11 13:44:29 UTC (rev 155521)
@@ -1,3 +1,16 @@
+2013-09-11 Patrick Gansterer
+
+[CMake] Split out generic Windows files into its own file
+https://bugs.webkit.org/show_bug.cgi?id=119514
+
+Reviewed by Gyuyoung Kim.
+
+This allows us to add smaller CMakeLists.txt files when
+adding additional Windows ports.
+
+* Source/cmake/OptionsWinCE.cmake:
+* Source/cmake/WebKitMacros.cmake:
+
2013-09-11 Alberto Garcia
autogen.sh: fix removal of autom4te.cache
Modified: trunk/Source/WTF/ChangeLog (155520 => 155521)
--- trunk/Source/WTF/ChangeLog 2013-09-11 12:05:10 UTC (rev 155520)
+++ trunk/Source/WTF/ChangeLog 2013-09-11 13:44:29 UTC (rev 155521)
@@ -1,3 +1,15 @@
+2013-09-11 Patrick Gansterer
+
+[CMake] Split out generic Windows files into its own file
+https://bugs.webkit.org/show_bug.cgi?id=119514
+
+Reviewed by Gyuyoung Kim.
+
+This allows us to add smaller CMakeLists.txt files when
+adding additional Windows ports.
+
+* wtf/PlatformWin.cmake: Renamed from Source/WTF/wtf/PlatformWinCE.cmake.
+
2013-09-10 Daniel Bates
[iOS] Upstream text autosizing
Added: trunk/Source/WTF/wtf/PlatformWin.cmake (0 => 155521)
--- trunk/Source/WTF/wtf/PlatformWin.cmake (rev 0)
+++ trunk/Source/WTF/wtf/PlatformWin.cmake 2013-09-11 13:44:29 UTC (rev 155521)
@@ -0,0 +1,15 @@
+list(APPEND WTF_SOURCES
+threads/win/BinarySemaphoreWin.cpp
+
+win/MainThreadWin.cpp
+)
+
+if (WINCE)
+list(APPEND WTF_LIBRARIES
+mmtimer
+)
+else ()
+list(APPEND WTF_LIBRARIES
+winmm
+)
+endif ()
Deleted: trunk/Source/WTF/wtf/PlatformWinCE.cmake (155520 => 155521)
--- trunk/Source/WTF/wtf/PlatformWinCE.cmake 2013-09-11 12:05:10 UTC (rev 155520)
+++ trunk/Source/WTF/wtf/PlatformWinCE.cmake 2013-09-11 13:44:29 UTC (rev 155521)
@@ -1,9 +0,0 @@
-list(APPEND WTF_SOURCES
-threads/win/BinarySemaphoreWin.cpp
-
-win/MainThreadWin.cpp
-)
-
-list(APPEND WTF_LIBRARIES
-mmtimer
-)
Modified: trunk/Source/WebCore/ChangeLog (155520 => 155521)
--- trunk/Source/WebCore/ChangeLog 2013-09-11 12:05:10 UTC (rev 155520)
+++ trunk/Source/WebCore/ChangeLog 2013-09-11 13:44:29 UTC (rev 155521)
@@ -1,3 +1,16 @@
+2013-09-11 Patrick Gansterer
+
+[CMake] Split out generic Windows files into its own file
+https://bugs.webkit.org/show_bug.cgi?id=119514
+
+Reviewed by Gyuyoung Kim.
+
+This allows us to add smaller CMakeLists.txt files when
+adding additional Windows ports.
+
+* PlatformWin.cmake: Copied from Source/WebCore/PlatformWinCE.cmake.
+* PlatformWinCE.cmake:
+
2013-09-11 Mario Sanchez Prada
[GTK] Get rid of Pango/Gail dependencies in accessibility for ATK
Copied: trunk/Source/WebCore/PlatformWin.cmake (from rev 155520, trunk/Source/WebCore/PlatformWinCE.cmake) (0 => 155521)
--- trunk/Source/WebCore/PlatformWin.cmake (rev 0)
+++ trunk/Source/WebCore/PlatformWin.cmake 2013-09-11 13:44:29 UTC (rev 155521)
@@ -0,0 +1,86 @@
+list(APPEND WebCore_INCLUDE_DIRECTORIES
+"${WEBCORE_DIR}/accessibility/win"
+"${WEBCORE_DIR}/page/win"
+"${WEBCORE_DIR}/platform/graphics/opentype"
+"${WEBCORE_DIR}/platform/graphics/win"
+"${WEBCORE_DIR}/platform/win"
+"${WEBCORE_DIR}/plugins/win"
+)
+
+list(APPEND WebCore_SOURCES
+accessibility/win/AccessibilityObjectWin.cpp
+
+html/HTMLSelectElementWin.cpp
+
+page/win/DragControllerWin.cpp
+page/win/EventHandlerWin.cpp
+page/win/FrameWin.cpp
+
+platform/Cursor.cpp
+platform/LocalizedStrings.cpp
+platform/PlatformStrategies.cpp
+
+platform/graphics/opentype/OpenTypeUtilities.cpp
+
+platform/graphics/win/DIBPixelData.cpp
+platform/graphics/win/GDIExtras.cpp
+platform/grap
[webkit-changes] [154978] trunk
Title: [154978] trunk
Revision 154978
Author par...@webkit.org
Date 2013-09-03 06:25:14 -0700 (Tue, 03 Sep 2013)
Log Message
[CMake] Fix detection of x86_64 platform with MSVC
https://bugs.webkit.org/show_bug.cgi?id=116662
Reviewed by Gyuyoung Kim.
Use ${MSVC_CXX_ARCHITECTURE_ID} instead of ${CMAKE_SYSTEM_PROCESSOR}, since
the later one just resolves to the host processor on Windows.
* CMakeLists.txt:
Modified Paths
trunk/CMakeLists.txt
trunk/ChangeLog
Diff
Modified: trunk/CMakeLists.txt (154977 => 154978)
--- trunk/CMakeLists.txt 2013-09-03 13:16:54 UTC (rev 154977)
+++ trunk/CMakeLists.txt 2013-09-03 13:25:14 UTC (rev 154978)
@@ -67,17 +67,23 @@
# -
# Determine the target processor
# -
-string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR)
+# Use MSVC_CXX_ARCHITECTURE_ID instead of CMAKE_SYSTEM_PROCESSOR when defined,
+# since the later one just resolves to the host processor on Windows.
+if (MSVC_CXX_ARCHITECTURE_ID)
+string(TOLOWER ${MSVC_CXX_ARCHITECTURE_ID} LOWERCASE_CMAKE_SYSTEM_PROCESSOR)
+else ()
+string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR)
+endif ()
if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
set(WTF_CPU_ARM 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
set(WTF_CPU_MIPS 1)
-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|amd64)")
+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)")
set(WTF_CPU_X86_64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
set(WTF_CPU_X86 1)
else ()
-message(FATAL_ERROR "Unknown CPU '${CMAKE_SYSTEM_PROCESSOR}'")
+message(FATAL_ERROR "Unknown CPU '${LOWERCASE_CMAKE_SYSTEM_PROCESSOR}'")
endif ()
# -
Modified: trunk/ChangeLog (154977 => 154978)
--- trunk/ChangeLog 2013-09-03 13:16:54 UTC (rev 154977)
+++ trunk/ChangeLog 2013-09-03 13:25:14 UTC (rev 154978)
@@ -1,3 +1,15 @@
+2013-09-03 Patrick Gansterer
+
+[CMake] Fix detection of x86_64 platform with MSVC
+https://bugs.webkit.org/show_bug.cgi?id=116662
+
+Reviewed by Gyuyoung Kim.
+
+Use ${MSVC_CXX_ARCHITECTURE_ID} instead of ${CMAKE_SYSTEM_PROCESSOR}, since
+the later one just resolves to the host processor on Windows.
+
+* CMakeLists.txt:
+
2013-08-29 Sam Weinig
Add ENABLE guards for Promises
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [153968] trunk/Source/WebCore
Title: [153968] trunk/Source/WebCore
Revision 153968
Author par...@webkit.org
Date 2013-08-12 17:35:45 -0700 (Mon, 12 Aug 2013)
Log Message
[CMake] Use the correct list of files when compiling ANGLESupport on Windows
https://bugs.webkit.org/show_bug.cgi?id=119439
Reviewed by Gyuyoung Kim.
* CMakeLists.txt: Use ossource_win.cpp instead of ossource_posix.cpp on Windows platforms.
Modified Paths
trunk/Source/WebCore/CMakeLists.txt
trunk/Source/WebCore/ChangeLog
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (153967 => 153968)
--- trunk/Source/WebCore/CMakeLists.txt 2013-08-13 00:28:16 UTC (rev 153967)
+++ trunk/Source/WebCore/CMakeLists.txt 2013-08-13 00:35:45 UTC (rev 153968)
@@ -2887,7 +2887,6 @@
${THIRDPARTY_DIR}/ANGLE/src/compiler/intermOut.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/IntermTraverse.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/MapLongVariableNames.cpp
-${THIRDPARTY_DIR}/ANGLE/src/compiler/ossource_posix.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/OutputESSL.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/OutputGLSL.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/OutputGLSLBase.cpp
@@ -2926,6 +2925,16 @@
${THIRDPARTY_DIR}/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp
)
+if (WIN32)
+list(APPEND ANGLESupport_SOURCES
+${THIRDPARTY_DIR}/ANGLE/src/compiler/ossource_win.cpp
+)
+else ()
+list(APPEND ANGLESupport_SOURCES
+${THIRDPARTY_DIR}/ANGLE/src/compiler/ossource_posix.cpp
+)
+endif ()
+
list(APPEND WebCore_SOURCES
platform/graphics/ANGLEWebKitBridge.cpp
platform/graphics/GraphicsContext3D.cpp
Modified: trunk/Source/WebCore/ChangeLog (153967 => 153968)
--- trunk/Source/WebCore/ChangeLog 2013-08-13 00:28:16 UTC (rev 153967)
+++ trunk/Source/WebCore/ChangeLog 2013-08-13 00:35:45 UTC (rev 153968)
@@ -1,3 +1,12 @@
+2013-08-12 Patrick Gansterer
+
+[CMake] Use the correct list of files when compiling ANGLESupport on Windows
+https://bugs.webkit.org/show_bug.cgi?id=119439
+
+Reviewed by Gyuyoung Kim.
+
+* CMakeLists.txt: Use ossource_win.cpp instead of ossource_posix.cpp on Windows platforms.
+
2013-08-12 Arnaud Renevier
[cairo] memory corruption with putImageData and accelerated canvas.
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [153779] trunk/Source/WebKit/win
Title: [153779] trunk/Source/WebKit/win
Revision 153779
Author par...@webkit.org
Date 2013-08-07 00:19:47 -0700 (Wed, 07 Aug 2013)
Log Message
Remove dependency on CoreFoundation from WebURLResponse
https://bugs.webkit.org/show_bug.cgi?id=119390
Reviewed by Brent Fulgham.
* WebURLResponse.cpp:
(localizedShortDescriptionForStatusCode):
(WebURLResponse::localizedStringForStatusCode):
Modified Paths
trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/WebURLResponse.cpp
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (153778 => 153779)
--- trunk/Source/WebKit/win/ChangeLog 2013-08-07 04:04:50 UTC (rev 153778)
+++ trunk/Source/WebKit/win/ChangeLog 2013-08-07 07:19:47 UTC (rev 153779)
@@ -1,3 +1,14 @@
+2013-08-07 Patrick Gansterer
+
+Remove dependency on CoreFoundation from WebURLResponse
+https://bugs.webkit.org/show_bug.cgi?id=119390
+
+Reviewed by Brent Fulgham.
+
+* WebURLResponse.cpp:
+(localizedShortDescriptionForStatusCode):
+(WebURLResponse::localizedStringForStatusCode):
+
2013-08-05 Mark Rowe
Another Windows release build fix.
Modified: trunk/Source/WebKit/win/WebURLResponse.cpp (153778 => 153779)
--- trunk/Source/WebKit/win/WebURLResponse.cpp 2013-08-07 04:04:50 UTC (rev 153778)
+++ trunk/Source/WebKit/win/WebURLResponse.cpp 2013-08-07 07:19:47 UTC (rev 153779)
@@ -47,7 +47,7 @@
using namespace WebCore;
-static String CFHTTPMessageCopyLocalizedShortDescriptionForStatusCode(CFIndex statusCode)
+static String localizedShortDescriptionForStatusCode(int statusCode)
{
String result;
if (statusCode < 100 || statusCode >= 600)
@@ -372,7 +372,7 @@
ASSERT(m_response.isHTTP());
if (statusString)
*statusString = 0;
-String statusText = CFHTTPMessageCopyLocalizedShortDescriptionForStatusCode(statusCode);
+const String& statusText = localizedShortDescriptionForStatusCode(statusCode);
if (!statusText)
return E_FAIL;
if (statusString)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [153762] trunk/Source/JavaScriptCore
Title: [153762] trunk/Source/_javascript_Core Revision 153762 Author par...@webkit.org Date 2013-08-06 13:51:22 -0700 (Tue, 06 Aug 2013) Log Message Remove useless code from COMPILER(RVCT) JITStubs https://bugs.webkit.org/show_bug.cgi?id=119521 Reviewed by Geoffrey Garen. * jit/JITStubsARMv7.h: (JSC::ctiVMThrowTrampoline): "ldr r6, [sp, #PRESERVED_R6_OFFSET]" was called twice. (JSC::ctiOpThrowNotCaught): Ditto. Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/jit/JITStubsARMv7.h Diff Modified: trunk/Source/_javascript_Core/ChangeLog (153761 => 153762) --- trunk/Source/_javascript_Core/ChangeLog 2013-08-06 20:37:13 UTC (rev 153761) +++ trunk/Source/_javascript_Core/ChangeLog 2013-08-06 20:51:22 UTC (rev 153762) @@ -1,3 +1,14 @@ +2013-08-06 Patrick Gansterer + +Remove useless code from COMPILER(RVCT) JITStubs +https://bugs.webkit.org/show_bug.cgi?id=119521 + +Reviewed by Geoffrey Garen. + +* jit/JITStubsARMv7.h: +(JSC::ctiVMThrowTrampoline): "ldr r6, [sp, #PRESERVED_R6_OFFSET]" was called twice. +(JSC::ctiOpThrowNotCaught): Ditto. + 2013-07-23 David Farler Provide optional OTHER_CFLAGS, OTHER_CPPFLAGS, OTHER_LDFLAGS additions for building with ASAN Modified: trunk/Source/_javascript_Core/jit/JITStubsARMv7.h (153761 => 153762) --- trunk/Source/_javascript_Core/jit/JITStubsARMv7.h 2013-08-06 20:37:13 UTC (rev 153761) +++ trunk/Source/_javascript_Core/jit/JITStubsARMv7.h 2013-08-06 20:51:22 UTC (rev 153762) @@ -529,7 +529,6 @@ ldr r8, [sp, # PRESERVED_R8_OFFSET ] ldr r7, [sp, # PRESERVED_R7_OFFSET ] ldr r6, [sp, # PRESERVED_R6_OFFSET ] -ldr r6, [sp, # PRESERVED_R6_OFFSET ] ldr r5, [sp, # PRESERVED_R5_OFFSET ] ldr r4, [sp, # PRESERVED_R4_OFFSET ] ldr lr, [sp, # PRESERVED_RETURN_ADDRESS_OFFSET ] @@ -546,7 +545,6 @@ ldr r8, [sp, # PRESERVED_R8_OFFSET ] ldr r7, [sp, # PRESERVED_R7_OFFSET ] ldr r6, [sp, # PRESERVED_R6_OFFSET ] -ldr r6, [sp, # PRESERVED_R6_OFFSET ] ldr r5, [sp, # PRESERVED_R5_OFFSET ] ldr r4, [sp, # PRESERVED_R4_OFFSET ] ldr lr, [sp, # PRESERVED_RETURN_ADDRESS_OFFSET ] ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [153745] trunk/Source/JavaScriptCore
Title: [153745] trunk/Source/_javascript_Core
Revision 153745
Author par...@webkit.org
Date 2013-08-06 03:04:18 -0700 (Tue, 06 Aug 2013)
Log Message
Build fix for ARM MSVC after r153222 and r153648.
* jit/JITStubsARM.h: Added ctiVMThrowTrampolineSlowpath.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/jit/JITStubsARM.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (153744 => 153745)
--- trunk/Source/_javascript_Core/ChangeLog 2013-08-06 10:03:30 UTC (rev 153744)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-08-06 10:04:18 UTC (rev 153745)
@@ -1,5 +1,11 @@
2013-08-06 Patrick Gansterer
+Build fix for ARM MSVC after r153222 and r153648.
+
+* jit/JITStubsARM.h: Added ctiVMThrowTrampolineSlowpath.
+
+2013-08-06 Patrick Gansterer
+
Build fix for ARM MSVC after r150109.
Read the stub template from a header files instead of the JITStubs.cpp.
Modified: trunk/Source/_javascript_Core/jit/JITStubsARM.h (153744 => 153745)
--- trunk/Source/_javascript_Core/jit/JITStubsARM.h 2013-08-06 10:03:30 UTC (rev 153744)
+++ trunk/Source/_javascript_Core/jit/JITStubsARM.h 2013-08-06 10:04:18 UTC (rev 153745)
@@ -459,6 +459,8 @@
MSVC_BEGIN(EXPORT ctiTrampolineEnd)
MSVC_BEGIN(EXPORT ctiVMThrowTrampoline)
MSVC_BEGIN(EXPORT ctiOpThrowNotCaught)
+MSVC_BEGIN(EXPORT ctiVMThrowTrampolineSlowpath)
+MSVC_BEGIN(IMPORT cti_vm_throw_slowpath)
MSVC_BEGIN()
MSVC_BEGIN(ctiTrampoline PROC)
MSVC_BEGIN(stmdb sp!, {r1-r3})
@@ -486,6 +488,13 @@
MSVC_BEGIN(bx lr)
MSVC_BEGIN(ctiVMThrowTrampoline ENDP)
MSVC_BEGIN()
+MSVC_BEGIN(ctiVMThrowTrampolineSlowpath PROC)
+MSVC_BEGIN(mov r0, r5)
+MSVC_BEGIN(bl cti_vm_throw_slowpath)
+MSVC_BEGIN(mov r5, r0)
+MSVC_BEGIN(bx r1)
+MSVC_BEGIN(ctiVMThrowTrampolineSlowpath ENDP)
+MSVC_BEGIN()
MSVC(EXPORT cti_#op#)
MSVC(IMPORT JITStubThunked_#op#)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [153744] trunk/Source/JavaScriptCore
Title: [153744] trunk/Source/_javascript_Core
Revision 153744
Author par...@webkit.org
Date 2013-08-06 03:03:30 -0700 (Tue, 06 Aug 2013)
Log Message
Build fix for ARM MSVC after r150109.
Read the stub template from a header files instead of the JITStubs.cpp.
* CMakeLists.txt:
* DerivedSources.pri:
* create_jit_stubs:
Modified Paths
trunk/Source/_javascript_Core/CMakeLists.txt
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/DerivedSources.pri
trunk/Source/_javascript_Core/create_jit_stubs
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (153743 => 153744)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2013-08-06 09:36:04 UTC (rev 153743)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2013-08-06 10:03:30 UTC (rev 153744)
@@ -588,8 +588,9 @@
add_custom_command(
OUTPUT ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
MAIN_DEPENDENCY ${_javascript_CORE_DIR}/create_jit_stubs
+DEPENDS ${_javascript_CORE_DIR}/jit/JITStubsARM.h
DEPENDS ${_javascript_CORE_DIR}/jit/JITStubs.cpp
-COMMAND ${PERL_EXECUTABLE} ${_javascript_CORE_DIR}/create_jit_stubs --prefix=MSVC ${_javascript_CORE_DIR}/jit/JITStubs.cpp > ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
+COMMAND ${PERL_EXECUTABLE} ${_javascript_CORE_DIR}/create_jit_stubs --prefix=MSVC --header ${_javascript_CORE_DIR}/jit/JITStubsARM.h ${_javascript_CORE_DIR}/jit/JITStubs.cpp > ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
VERBATIM)
add_custom_command(
Modified: trunk/Source/_javascript_Core/ChangeLog (153743 => 153744)
--- trunk/Source/_javascript_Core/ChangeLog 2013-08-06 09:36:04 UTC (rev 153743)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-08-06 10:03:30 UTC (rev 153744)
@@ -1,3 +1,13 @@
+2013-08-06 Patrick Gansterer
+
+Build fix for ARM MSVC after r150109.
+
+Read the stub template from a header files instead of the JITStubs.cpp.
+
+* CMakeLists.txt:
+* DerivedSources.pri:
+* create_jit_stubs:
+
2013-08-05 Oliver Hunt
Move TypedArray implementation into JSC
Modified: trunk/Source/_javascript_Core/DerivedSources.pri (153743 => 153744)
--- trunk/Source/_javascript_Core/DerivedSources.pri 2013-08-06 09:36:04 UTC (rev 153743)
+++ trunk/Source/_javascript_Core/DerivedSources.pri 2013-08-06 10:03:30 UTC (rev 153744)
@@ -64,7 +64,7 @@
# GENERATOR 2-A: JIT Stub functions for RVCT
rvctstubs.output = Generated${QMAKE_FILE_BASE}_RVCT.h
rvctstubs.script = $$PWD/create_jit_stubs
-rvctstubs.commands = perl -i $$rvctstubs.script --prefix RVCT ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
+rvctstubs.commands = perl -i $$rvctstubs.script --prefix RVCT --header $$PWD/jit/JITStubsARM.h ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
rvctstubs.depends = ${QMAKE_FILE_NAME}
rvctstubs.input = JIT_STUB_FILES
rvctstubs.CONFIG += no_link
@@ -73,7 +73,7 @@
# GENERATOR 2-B: JIT Stub functions for MSVC
msvcstubs.output = Generated${QMAKE_FILE_BASE}_MSVC.asm
msvcstubs.script = $$PWD/create_jit_stubs
-msvcstubs.commands = perl -i $$msvcstubs.script --prefix MSVC ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
+msvcstubs.commands = perl -i $$msvcstubs.script --prefix MSVC --header $$PWD/jit/JITStubsARM.h ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
msvcstubs.depends = ${QMAKE_FILE_NAME}
msvcstubs.input = JIT_STUB_FILES
msvcstubs.CONFIG += no_link
Modified: trunk/Source/_javascript_Core/create_jit_stubs (153743 => 153744)
--- trunk/Source/_javascript_Core/create_jit_stubs 2013-08-06 09:36:04 UTC (rev 153743)
+++ trunk/Source/_javascript_Core/create_jit_stubs 2013-08-06 10:03:30 UTC (rev 153744)
@@ -22,23 +22,25 @@
use File::Basename;
use Getopt::Long;
-my $usage = basename($0) . " --prefix prefix file";
+my $usage = basename($0) . " --prefix prefix --header header file";
my $rtype_template = quotemeta("#rtype#");
my $op_template = quotemeta("#op#");
my $prefix;
+my $header;
my $enable_dfg = 0;
my $file;
my $getOptionsResult = GetOptions(
'prefix=s' => \$prefix,
+'header=s' => \$header,
'dfg!' => \$enable_dfg
);
$file = $ARGV[0];
-die "$usage\n" unless ($prefix and $file);
+die "$usage\n" unless ($header and $prefix and $file);
my $stub_template = "";
my $output_end = "";
@@ -50,6 +52,22 @@
my $dfg_begin = 0;
print STDERR "Creating JIT stubs for $file \n";
+open(IN, $header) or die "No such file $header";
+
+while ( $_ = ) {
+if ( /^$prefix\_BEGIN\((.*)\)/ ) {
+$stub = $1;
+print $stub . "\n";
+}
+if ( /^$prefix\((.*)\)/ ) {
+$stub_template .= $1 . "\n";
+}
+if ( /^$prefix\_END\((.*)\)/ ) {
+$output_end .= $1 . "\n";
+}
+}
+
+close(IN);
open(IN, $file) or die "No such file $file";
while ( $_ = ) {
@@ -65,16 +83,6 @@
}
$if_counter--;
}
-if ( /^$prefix\_BEGIN\((.*)\)/ ) {
-$stub = $1;
-print $stub . "\n";
-}
-if ( /^$prefix\((.*)\)/ ) {
-
[webkit-changes] [153668] trunk/Source/WebCore
Title: [153668] trunk/Source/WebCore Revision 153668 Author par...@webkit.org Date 2013-08-02 14:30:31 -0700 (Fri, 02 Aug 2013) Log Message Remove WebCore folder from include statements https://bugs.webkit.org/show_bug.cgi?id=119438 Reviewed by Darin Adler. This aligns the style of the changed files with the other WebCore code. * platform/network/curl/CurlDownload.cpp: * platform/network/curl/CurlDownload.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp trunk/Source/WebCore/platform/network/curl/CurlDownload.h Diff Modified: trunk/Source/WebCore/ChangeLog (153667 => 153668) --- trunk/Source/WebCore/ChangeLog 2013-08-02 21:27:26 UTC (rev 153667) +++ trunk/Source/WebCore/ChangeLog 2013-08-02 21:30:31 UTC (rev 153668) @@ -1,3 +1,15 @@ +2013-08-02 Patrick Gansterer + +Remove WebCore folder from include statements +https://bugs.webkit.org/show_bug.cgi?id=119438 + +Reviewed by Darin Adler. + +This aligns the style of the changed files with the other WebCore code. + +* platform/network/curl/CurlDownload.cpp: +* platform/network/curl/CurlDownload.h: + 2013-08-02 Ryosuke Niwa FormAssociatedElement shouldn't create out-of-tree FormAttributeTargetObserver Modified: trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp (153667 => 153668) --- trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp 2013-08-02 21:27:26 UTC (rev 153667) +++ trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp 2013-08-02 21:30:31 UTC (rev 153668) @@ -26,10 +26,9 @@ #include "config.h" #include "CurlDownload.h" -#include -#include -#include - +#include "HTTPParsers.h" +#include "MainThreadTask.h" +#include "ResourceRequest.h" #include #include Modified: trunk/Source/WebCore/platform/network/curl/CurlDownload.h (153667 => 153668) --- trunk/Source/WebCore/platform/network/curl/CurlDownload.h 2013-08-02 21:27:26 UTC (rev 153667) +++ trunk/Source/WebCore/platform/network/curl/CurlDownload.h 2013-08-02 21:30:31 UTC (rev 153668) @@ -26,9 +26,9 @@ #ifndef CurlDownload_h #define CurlDownload_h -#include -#include -#include +#include "FileSystem.h" +#include "ResourceHandle.h" +#include "ResourceResponse.h" #if PLATFORM(WIN) #include ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [153645] trunk/Source/WebCore
Title: [153645] trunk/Source/WebCore
Revision 153645
Author par...@webkit.org
Date 2013-08-02 05:19:19 -0700 (Fri, 02 Aug 2013)
Log Message
[WIN] Fix build without precompiled header.
* accessibility/win/AccessibilityObjectWrapperWin.h: Added missing include.
* rendering/RenderThemeWin.cpp: Ditto.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.h
trunk/Source/WebCore/rendering/RenderThemeWin.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (153644 => 153645)
--- trunk/Source/WebCore/ChangeLog 2013-08-02 11:37:10 UTC (rev 153644)
+++ trunk/Source/WebCore/ChangeLog 2013-08-02 12:19:19 UTC (rev 153645)
@@ -1,3 +1,10 @@
+2013-08-02 Patrick Gansterer
+
+[WIN] Fix build without precompiled header.
+
+* accessibility/win/AccessibilityObjectWrapperWin.h: Added missing include.
+* rendering/RenderThemeWin.cpp: Ditto.
+
2013-08-02 Byungwoo Lee
Remove redundant call of argsList->current() from loops in CSSParser.
Modified: trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.h (153644 => 153645)
--- trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.h 2013-08-02 11:37:10 UTC (rev 153644)
+++ trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.h 2013-08-02 12:19:19 UTC (rev 153645)
@@ -27,6 +27,7 @@
#ifndef AccessibilityObjectWrapperWin_h
#define AccessibilityObjectWrapperWin_h
+#include
#include
namespace WebCore {
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (153644 => 153645)
--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2013-08-02 11:37:10 UTC (rev 153644)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2013-08-02 12:19:19 UTC (rev 153645)
@@ -28,8 +28,10 @@
#include "Frame.h"
#include "FrameSelection.h"
#include "GraphicsContext.h"
+#include "HTMLMeterElement.h"
#include "LocalWindowsContext.h"
#include "PaintInfo.h"
+#include "RenderMeter.h"
#include "RenderSlider.h"
#include "Settings.h"
#include "SoftLinking.h"
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [153644] trunk/Source/JavaScriptCore
Title: [153644] trunk/Source/_javascript_Core Revision 153644 Author par...@webkit.org Date 2013-08-02 04:37:10 -0700 (Fri, 02 Aug 2013) Log Message Add JSCTestRunnerUtils to the list of forwarding headers to fix build. * CMakeLists.txt: Modified Paths trunk/Source/_javascript_Core/CMakeLists.txt trunk/Source/_javascript_Core/ChangeLog Diff Modified: trunk/Source/_javascript_Core/CMakeLists.txt (153643 => 153644) --- trunk/Source/_javascript_Core/CMakeLists.txt 2013-08-02 10:49:04 UTC (rev 153643) +++ trunk/Source/_javascript_Core/CMakeLists.txt 2013-08-02 11:37:10 UTC (rev 153644) @@ -536,6 +536,7 @@ API/APIShims.h API/_javascript_.h API/JSBase.h +API/JSCTestRunnerUtils.h API/JSContextRef.h API/JSContextRefPrivate.h API/JSObjectRef.h Modified: trunk/Source/_javascript_Core/ChangeLog (153643 => 153644) --- trunk/Source/_javascript_Core/ChangeLog 2013-08-02 10:49:04 UTC (rev 153643) +++ trunk/Source/_javascript_Core/ChangeLog 2013-08-02 11:37:10 UTC (rev 153644) @@ -1,3 +1,9 @@ +2013-08-02 Patrick Gansterer + +Add JSCTestRunnerUtils to the list of forwarding headers to fix build. + +* CMakeLists.txt: + 2013-08-01 Ruth Fong [Forms: color] popover color well implementation ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [153639] trunk/Tools
Title: [153639] trunk/Tools Revision 153639 Author par...@webkit.org Date 2013-08-02 01:32:30 -0700 (Fri, 02 Aug 2013) Log Message Add --rmdir option to git svn dcommit https://bugs.webkit.org/show_bug.cgi?id=119398 Reviewed by Ryosuke Niwa. Add this option tells git-svn to remove empty directories from the svn tree so they do not leave over there. * Scripts/webkitpy/common/checkout/scm/git.py: (Git.push_local_commits_to_server): Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py Diff Modified: trunk/Tools/ChangeLog (153638 => 153639) --- trunk/Tools/ChangeLog 2013-08-02 08:20:23 UTC (rev 153638) +++ trunk/Tools/ChangeLog 2013-08-02 08:32:30 UTC (rev 153639) @@ -1,3 +1,16 @@ +2013-08-02 Patrick Gansterer + +Add --rmdir option to git svn dcommit +https://bugs.webkit.org/show_bug.cgi?id=119398 + +Reviewed by Ryosuke Niwa. + +Add this option tells git-svn to remove empty directories +from the svn tree so they do not leave over there. + +* Scripts/webkitpy/common/checkout/scm/git.py: +(Git.push_local_commits_to_server): + 2013-08-01 Brent Fulgham [Windows] WebKit1 Fullscreen Video Play is Broken Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py (153638 => 153639) --- trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2013-08-02 08:20:23 UTC (rev 153638) +++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2013-08-02 08:32:30 UTC (rev 153639) @@ -471,7 +471,7 @@ self._run_git(['commit', '--all', '-F', '-'], input=message) def push_local_commits_to_server(self, username=None, password=None): -dcommit_command = ['svn', 'dcommit'] +dcommit_command = ['svn', 'dcommit', '--rmdir'] if (not username or not password) and not self.has_authorization_for_realm(self.svn_server_realm): raise AuthenticationError(self.svn_server_host, prompt_for_password=True) if username: ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [153589] trunk/Source/WebCore
Title: [153589] trunk/Source/WebCore
Revision 153589
Author par...@webkit.org
Date 2013-08-01 10:07:03 -0700 (Thu, 01 Aug 2013)
Log Message
Merge FrameWinCE into FrameWin
https://bugs.webkit.org/show_bug.cgi?id=117988
Reviewed by Brent Fulgham.
Reuse the code from FrameWin.cpp instead of duplicating it.
* PlatformWinCE.cmake:
* page/win/FrameGdiWin.cpp: Added.
(WebCore::imageFromRect):
* page/wince/FrameWinCE.cpp: Removed.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/PlatformWinCE.cmake
Added Paths
trunk/Source/WebCore/page/win/FrameGdiWin.cpp
Removed Paths
trunk/Source/WebCore/page/wince/FrameWinCE.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (153588 => 153589)
--- trunk/Source/WebCore/ChangeLog 2013-08-01 16:53:48 UTC (rev 153588)
+++ trunk/Source/WebCore/ChangeLog 2013-08-01 17:07:03 UTC (rev 153589)
@@ -1,3 +1,17 @@
+2013-08-01 Patrick Gansterer
+
+Merge FrameWinCE into FrameWin
+https://bugs.webkit.org/show_bug.cgi?id=117988
+
+Reviewed by Brent Fulgham.
+
+Reuse the code from FrameWin.cpp instead of duplicating it.
+
+* PlatformWinCE.cmake:
+* page/win/FrameGdiWin.cpp: Added.
+(WebCore::imageFromRect):
+* page/wince/FrameWinCE.cpp: Removed.
+
2013-08-01 Alex Christensen
Made OESTextureHalfFloat work on Windows.
Modified: trunk/Source/WebCore/PlatformWinCE.cmake (153588 => 153589)
--- trunk/Source/WebCore/PlatformWinCE.cmake 2013-08-01 16:53:48 UTC (rev 153588)
+++ trunk/Source/WebCore/PlatformWinCE.cmake 2013-08-01 17:07:03 UTC (rev 153589)
@@ -23,7 +23,8 @@
page/win/DragControllerWin.cpp
page/win/EventHandlerWin.cpp
-page/wince/FrameWinCE.cpp
+page/win/FrameGdiWin.cpp
+page/win/FrameWin.cpp
rendering/RenderThemeWince.cpp
Added: trunk/Source/WebCore/page/win/FrameGdiWin.cpp (0 => 153589)
--- trunk/Source/WebCore/page/win/FrameGdiWin.cpp (rev 0)
+++ trunk/Source/WebCore/page/win/FrameGdiWin.cpp 2013-08-01 17:07:03 UTC (rev 153589)
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2009 Torch Mobile, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "FrameWin.h"
+
+#include "Frame.h"
+#include "FrameView.h"
+#include "GraphicsContext.h"
+#include
+
+namespace WebCore {
+
+extern HDC g_screenDC;
+
+PassOwnPtr imageFromRect(Frame* frame, IntRect& ir)
+{
+int w;
+int h;
+FrameView* view = frame->view();
+if (view->parent()) {
+ir.setLocation(view->parent()->convertChildToSelf(view, ir.location()));
+w = ir.width() * frame->pageZoomFactor() + 0.5;
+h = ir.height() * frame->pageZoomFactor() + 0.5;
+} else {
+ir = view->contentsToWindow(ir);
+w = ir.width();
+h = ir.height();
+}
+
+OwnPtr bmpDC = adoptPtr(CreateCompatibleDC(g_screenDC));
+OwnPtr hBmp = adoptPtr(CreateCompatibleBitmap(g_screenDC, w, h));
+if (!hBmp)
+return nullptr;
+
+HGDIOBJ hbmpOld = SelectObject(bmpDC.get(), hBmp.get());
+
+{
+GraphicsContext gc(bmpDC.get());
+view->paint(&gc, ir);
+}
+
+SelectObject(bmpDC.get(), hbmpOld);
+
+return hBmp.release();
+}
+
+} // namespace WebCore
Deleted: trunk/Source/WebCore/page/wince/FrameWinCE.cpp (153588 => 153589)
--- trunk/Source/WebCore/page/wince/FrameWinCE.cpp 2013-08-01 16:53:48 UTC (rev 153588)
+++ trunk/Source/WebCore/page/wince/FrameWinCE.cpp 2013-08-01 17:07:03 UTC (rev 153589)
@@ -1,160 +0,0 @@
-/*
- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
- * Copyright (C) 2007-2009 Torch Mobile, Inc.
- *
- * Redistribution and use
[webkit-changes] [153586] trunk/Source
Title: [153586] trunk/Source
Revision 153586
Author par...@webkit.org
Date 2013-08-01 09:23:14 -0700 (Thu, 01 Aug 2013)
Log Message
Rearrange the code of FrameWin
https://bugs.webkit.org/show_bug.cgi?id=117984
Reviewed by Brent Fulgham.
Source/WebCore:
Move code from the CG implementation into the general file so we can
share the code with Windows CE port in a next step. In a first step
it only shares more code between the CG and Cairo implementations.
Also use OwnPtr instead of plain pointers to make ownership more clear.
* page/win/FrameCGWin.cpp:
(WebCore::imageFromRect):
* page/win/FrameCairoWin.cpp:
(WebCore::imageFromRect):
* page/win/FrameWin.cpp:
(WebCore::imageFromSelection):
(WebCore::Frame::dragImageForSelection):
(WebCore::Frame::nodeImage):
* page/win/FrameWin.h:
Source/WebKit/win:
* WebView.cpp:
(WebView::generateSelectionImage):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/win/FrameCGWin.cpp
trunk/Source/WebCore/page/win/FrameCairoWin.cpp
trunk/Source/WebCore/page/win/FrameWin.cpp
trunk/Source/WebCore/page/win/FrameWin.h
trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/WebView.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (153585 => 153586)
--- trunk/Source/WebCore/ChangeLog 2013-08-01 15:35:47 UTC (rev 153585)
+++ trunk/Source/WebCore/ChangeLog 2013-08-01 16:23:14 UTC (rev 153586)
@@ -1,3 +1,25 @@
+2013-08-01 Patrick Gansterer
+
+Rearrange the code of FrameWin
+https://bugs.webkit.org/show_bug.cgi?id=117984
+
+Reviewed by Brent Fulgham.
+
+Move code from the CG implementation into the general file so we can
+share the code with Windows CE port in a next step. In a first step
+it only shares more code between the CG and Cairo implementations.
+Also use OwnPtr instead of plain pointers to make ownership more clear.
+
+* page/win/FrameCGWin.cpp:
+(WebCore::imageFromRect):
+* page/win/FrameCairoWin.cpp:
+(WebCore::imageFromRect):
+* page/win/FrameWin.cpp:
+(WebCore::imageFromSelection):
+(WebCore::Frame::dragImageForSelection):
+(WebCore::Frame::nodeImage):
+* page/win/FrameWin.h:
+
2013-08-01 Andrei Parvu
mask-repeat: round bug
Modified: trunk/Source/WebCore/page/win/FrameCGWin.cpp (153585 => 153586)
--- trunk/Source/WebCore/page/win/FrameCGWin.cpp 2013-08-01 15:35:47 UTC (rev 153585)
+++ trunk/Source/WebCore/page/win/FrameCGWin.cpp 2013-08-01 16:23:14 UTC (rev 153586)
@@ -49,7 +49,7 @@
view->paint(gc, rect);
}
-static HBITMAP imageFromRect(const Frame* frame, IntRect& ir)
+PassOwnPtr imageFromRect(const Frame* frame, IntRect& ir)
{
PaintBehavior oldPaintBehavior = frame->view()->paintBehavior();
frame->view()->setPaintBehavior(oldPaintBehavior | PaintBehaviorFlattenCompositingLayers);
@@ -60,8 +60,8 @@
int h = ir.height();
BitmapInfo bmp = BitmapInfo::create(IntSize(w, h));
-HBITMAP hbmp = CreateDIBSection(0, &bmp, DIB_RGB_COLORS, static_cast(&bits), 0, 0);
-HBITMAP hbmpOld = static_cast(SelectObject(hdc, hbmp));
+OwnPtr hbmp = adoptPtr(CreateDIBSection(0, &bmp, DIB_RGB_COLORS, static_cast(&bits), 0, 0));
+HGDIOBJ hbmpOld = SelectObject(hdc, hbmp.get());
CGContextRef context = CGBitmapContextCreate(static_cast(bits), w, h,
8, w * sizeof(RGBQUAD), deviceRGBColorSpaceRef(), kCGBitmapByteOrder32Little | kCGImageAlphaPremultipliedFirst);
CGContextSaveGState(context);
@@ -76,38 +76,7 @@
frame->view()->setPaintBehavior(oldPaintBehavior);
-return hbmp;
+return hbmp.release();
}
-HBITMAP imageFromSelection(Frame* frame, bool forceBlackText)
-{
-frame->document()->updateLayout();
-
-frame->view()->setPaintBehavior(PaintBehaviorSelectionOnly | (forceBlackText ? PaintBehaviorForceBlackText : 0));
-FloatRect fr = frame->selection()->bounds();
-IntRect ir(static_cast(fr.x()), static_cast(fr.y()),
- static_cast(fr.width()), static_cast(fr.height()));
-HBITMAP image = imageFromRect(frame, ir);
-frame->view()->setPaintBehavior(PaintBehaviorNormal);
-return image;
-}
-
-DragImageRef Frame::nodeImage(Node* node)
-{
-document()->updateLayout();
-
-RenderObject* renderer = node->renderer();
-if (!renderer)
-return 0;
-
-LayoutRect topLevelRect;
-IntRect paintingRect = pixelSnappedIntRect(renderer->paintingRootRect(topLevelRect));
-
-m_view->setNodeToDraw(node); // invoke special sub-tree drawing mode
-HBITMAP result = imageFromRect(this, paintingRect);
-m_view->setNodeToDraw(0);
-
-return result;
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/page/win/FrameCairoWin.cpp (153585 => 153586)
--- trunk/Source/WebCore/page/win/FrameCairoWin.cpp 2013-08-01 15:35:47 UTC (rev 153585)
+++ trunk/Source/WebCore/page/win/FrameCairoWin.cpp 2013-08-01 16:23:14 UTC (rev 153586)
@@ -27,23 +27,14 @@
#include "Frame.h"
#include "FrameW
[webkit-changes] [153485] trunk/Source
Title: [153485] trunk/Source
Revision 153485
Author par...@webkit.org
Date 2013-07-30 12:01:07 -0700 (Tue, 30 Jul 2013)
Log Message
[WIN] Remove dependency on CoreFoundation from DownloadBundle
https://bugs.webkit.org/show_bug.cgi?id=119247
Reviewed by Anders Carlsson.
* platform/network/cf/DownloadBundle.h:
* platform/network/curl/DownloadBundle.h:
* platform/network/win/DownloadBundleWin.cpp:
(WebCore::DownloadBundle::magicNumber):
(WebCore::DownloadBundle::appendResumeData):
(WebCore::DownloadBundle::extractResumeData):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/cf/DownloadBundle.h
trunk/Source/WebCore/platform/network/curl/DownloadBundle.h
trunk/Source/WebCore/platform/network/win/DownloadBundleWin.cpp
trunk/Source/WebKit/win/WebDownloadCFNet.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (153484 => 153485)
--- trunk/Source/WebCore/ChangeLog 2013-07-30 18:54:58 UTC (rev 153484)
+++ trunk/Source/WebCore/ChangeLog 2013-07-30 19:01:07 UTC (rev 153485)
@@ -1,5 +1,19 @@
2013-07-30 Patrick Gansterer
+[WIN] Remove dependency on CoreFoundation from DownloadBundle
+https://bugs.webkit.org/show_bug.cgi?id=119247
+
+Reviewed by Anders Carlsson.
+
+* platform/network/cf/DownloadBundle.h:
+* platform/network/curl/DownloadBundle.h:
+* platform/network/win/DownloadBundleWin.cpp:
+(WebCore::DownloadBundle::magicNumber):
+(WebCore::DownloadBundle::appendResumeData):
+(WebCore::DownloadBundle::extractResumeData):
+
+2013-07-30 Patrick Gansterer
+
Move WindowsExtras.h from WebCore to WTF
https://bugs.webkit.org/show_bug.cgi?id=118125
Modified: trunk/Source/WebCore/platform/network/cf/DownloadBundle.h (153484 => 153485)
--- trunk/Source/WebCore/platform/network/cf/DownloadBundle.h 2013-07-30 18:54:58 UTC (rev 153484)
+++ trunk/Source/WebCore/platform/network/cf/DownloadBundle.h 2013-07-30 19:01:07 UTC (rev 153485)
@@ -27,14 +27,13 @@
#define DownloadBundle_h
#include
+#include
-typedef const struct __CFData* CFDataRef;
-
namespace WebCore {
namespace DownloadBundle {
-bool appendResumeData(CFDataRef resumeData, const String& bundlePath);
-CFDataRef extractResumeData(const String& bundlePath);
+bool appendResumeData(const char*, uint32_t, const String& bundlePath);
+bool extractResumeData(const String& bundlePath, Vector& resumeData);
const String& fileExtension();
} // namespace DownloadBundle
Modified: trunk/Source/WebCore/platform/network/curl/DownloadBundle.h (153484 => 153485)
--- trunk/Source/WebCore/platform/network/curl/DownloadBundle.h 2013-07-30 18:54:58 UTC (rev 153484)
+++ trunk/Source/WebCore/platform/network/curl/DownloadBundle.h 2013-07-30 19:01:07 UTC (rev 153485)
@@ -27,14 +27,13 @@
#define DownloadBundle_h
#include
+#include
-typedef const struct __CFData* CFDataRef;
-
namespace WebCore {
namespace DownloadBundle {
-bool appendResumeData(CFDataRef resumeData, const String& bundlePath);
-CFDataRef extractResumeData(const String& bundlePath);
+bool appendResumeData(const char*, uint32_t, const String& bundlePath);
+bool extractResumeData(const String& bundlePath, Vector& resumeData);
const String& fileExtension();
} // namespace DownloadBundle
Modified: trunk/Source/WebCore/platform/network/win/DownloadBundleWin.cpp (153484 => 153485)
--- trunk/Source/WebCore/platform/network/win/DownloadBundleWin.cpp 2013-07-30 18:54:58 UTC (rev 153484)
+++ trunk/Source/WebCore/platform/network/win/DownloadBundleWin.cpp 2013-07-30 19:01:07 UTC (rev 153485)
@@ -26,7 +26,6 @@
#include "config.h"
#include "DownloadBundle.h"
-#include
#include
#include
#include
@@ -37,7 +36,7 @@
namespace DownloadBundle {
-static UInt32 magicNumber()
+static uint32_t magicNumber()
{
return 0xDECAF4EA;
}
@@ -48,9 +47,9 @@
return extension;
}
-bool appendResumeData(CFDataRef resumeData, const String& bundlePath)
+bool appendResumeData(const char* resumeBytes, uint32_t resumeLength, const String& bundlePath)
{
-if (!resumeData) {
+if (!resumeBytes || !resumeLength) {
LOG_ERROR("Invalid resume data to write to bundle path");
return false;
}
@@ -68,16 +67,6 @@
bool result = false;
-const UInt8* resumeBytes = CFDataGetBytePtr(resumeData);
-ASSERT(resumeBytes);
-if (!resumeBytes)
-goto exit;
-
-CFIndex resumeLength = CFDataGetLength(resumeData);
-ASSERT(resumeLength > 0);
-if (resumeLength < 1)
-goto exit;
-
if (fwrite(resumeBytes, 1, resumeLength, bundle) != resumeLength) {
LOG_ERROR("Failed to write resume data to the bundle - errno(%i)", errno);
goto exit;
@@ -88,7 +77,7 @@
goto exit;
}
-const UInt32& magic = magicNumber();
+const uint32_t magic = magicNumber();
if (fwrite(&magic, 4, 1, bundle) != 1) {
LOG_ERROR("Failed to write footer magic number to the bundle - errno(%i)",
[webkit-changes] [153483] trunk/Source
Title: [153483] trunk/Source
Revision 153483
Author par...@webkit.org
Date 2013-07-30 11:54:18 -0700 (Tue, 30 Jul 2013)
Log Message
Move WindowsExtras.h from WebCore to WTF
https://bugs.webkit.org/show_bug.cgi?id=118125
Reviewed by Anders Carlsson.
Move it to WTF to be able to use the functions in WTF too.
Source/WebCore:
* platform/PlatformKeyboardEvent.h:
* platform/PlatformMouseEvent.h:
* platform/PlatformWheelEvent.h:
* platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h:
* platform/win/MIMETypeRegistryWin.cpp:
* platform/win/PasteboardWin.cpp:
* platform/win/PopupMenuWin.cpp:
* platform/win/RunLoopWin.cpp:
* platform/win/SharedTimerWin.cpp:
* platform/win/WindowMessageListener.h:
* plugins/win/PluginDatabaseWin.cpp:
Source/WTF:
* wtf/WindowsExtras.h: Renamed from Source/WebCore/platform/win/WindowsExtras.h.
(WTF::getRegistryValue):
(WTF::getWindowPointer):
(WTF::setWindowPointer):
* wtf/win/MainThreadWin.cpp:
(WTF::initializeMainThreadPlatform):
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/win/MainThreadWin.cpp
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/PlatformKeyboardEvent.h
trunk/Source/WebCore/platform/PlatformMouseEvent.h
trunk/Source/WebCore/platform/PlatformWheelEvent.h
trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h
trunk/Source/WebCore/platform/win/MIMETypeRegistryWin.cpp
trunk/Source/WebCore/platform/win/PasteboardWin.cpp
trunk/Source/WebCore/platform/win/PopupMenuWin.cpp
trunk/Source/WebCore/platform/win/RunLoopWin.cpp
trunk/Source/WebCore/platform/win/SharedTimerWin.cpp
trunk/Source/WebCore/platform/win/WindowMessageListener.h
trunk/Source/WebCore/plugins/win/PluginDatabaseWin.cpp
Added Paths
trunk/Source/WTF/wtf/WindowsExtras.h
Removed Paths
trunk/Source/WebCore/platform/win/WindowsExtras.h
Diff
Modified: trunk/Source/WTF/ChangeLog (153482 => 153483)
--- trunk/Source/WTF/ChangeLog 2013-07-30 18:28:35 UTC (rev 153482)
+++ trunk/Source/WTF/ChangeLog 2013-07-30 18:54:18 UTC (rev 153483)
@@ -1,3 +1,19 @@
+2013-07-30 Patrick Gansterer
+
+Move WindowsExtras.h from WebCore to WTF
+https://bugs.webkit.org/show_bug.cgi?id=118125
+
+Reviewed by Anders Carlsson.
+
+Move it to WTF to be able to use the functions in WTF too.
+
+* wtf/WindowsExtras.h: Renamed from Source/WebCore/platform/win/WindowsExtras.h.
+(WTF::getRegistryValue):
+(WTF::getWindowPointer):
+(WTF::setWindowPointer):
+* wtf/win/MainThreadWin.cpp:
+(WTF::initializeMainThreadPlatform):
+
2013-07-29 Carlos Garcia Campos
Unreviewed. Fix make distcheck.
Copied: trunk/Source/WTF/wtf/WindowsExtras.h (from rev 153482, trunk/Source/WebCore/platform/win/WindowsExtras.h) (0 => 153483)
--- trunk/Source/WTF/wtf/WindowsExtras.h (rev 0)
+++ trunk/Source/WTF/wtf/WindowsExtras.h 2013-07-30 18:54:18 UTC (rev 153483)
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2012 Patrick Gansterer
+ *
+ * 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 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 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 WindowsExtras_h
+#define WindowsExtras_h
+
+#if OS(WINDOWS)
+
+#include
+#include
+#include
+
+#ifndef HWND_MESSAGE
+const HWND HWND_MESSAGE = 0;
+#endif
+
+namespace WTF {
+
+inline HRESULT getRegistryValue(HKEY hkey, LPCWSTR pszSubKey, LPCWSTR pszValue, LPDWORD pdwType, LPVOID pvData, LPDWORD pcbData)
+{
+#if OS(WINCE)
+HKEY key;
+if (::RegOpenKeyExW(hkey, pszSubKey, 0, 0, &key) != ERROR_SUCCESS)
+return ERROR_INVALID_NAME;
+HRESULT result = ::RegQueryValueExW(key, pszValue, 0, pdwType, static_cast(pvData), pcbData);
+::RegCloseKey(key);
+return result;
+#else
+return ::SHGetValueW(hkey, pszSubKey, pszValue, pdwType, pvData, pc
[webkit-changes] [153484] trunk/Source/WebKit2
Title: [153484] trunk/Source/WebKit2
Revision 153484
Author par...@webkit.org
Date 2013-07-30 11:54:58 -0700 (Tue, 30 Jul 2013)
Log Message
Remove unused Download*.cpp files
https://bugs.webkit.org/show_bug.cgi?id=119248
Reviewed by Anders Carlsson.
* Shared/Downloads/cfnet/DownloadCFNet.cpp: Removed.
* Shared/Downloads/curl/DownloadCurl.cpp: Removed.
Modified Paths
trunk/Source/WebKit2/ChangeLog
Removed Paths
trunk/Source/WebKit2/Shared/Downloads/cfnet/DownloadCFNet.cpp
trunk/Source/WebKit2/Shared/Downloads/curl/DownloadCurl.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (153483 => 153484)
--- trunk/Source/WebKit2/ChangeLog 2013-07-30 18:54:18 UTC (rev 153483)
+++ trunk/Source/WebKit2/ChangeLog 2013-07-30 18:54:58 UTC (rev 153484)
@@ -1,3 +1,13 @@
+2013-07-30 Patrick Gansterer
+
+Remove unused Download*.cpp files
+https://bugs.webkit.org/show_bug.cgi?id=119248
+
+Reviewed by Anders Carlsson.
+
+* Shared/Downloads/cfnet/DownloadCFNet.cpp: Removed.
+* Shared/Downloads/curl/DownloadCurl.cpp: Removed.
+
2013-07-30 Jeff Miller
Page for WKPageLoaderClient processDidCrash callback always reports a process identifier of 0
Deleted: trunk/Source/WebKit2/Shared/Downloads/cfnet/DownloadCFNet.cpp (153483 => 153484)
--- trunk/Source/WebKit2/Shared/Downloads/cfnet/DownloadCFNet.cpp 2013-07-30 18:54:18 UTC (rev 153483)
+++ trunk/Source/WebKit2/Shared/Downloads/cfnet/DownloadCFNet.cpp 2013-07-30 18:54:58 UTC (rev 153484)
@@ -1,266 +0,0 @@
-/*
- * Copyright (C) 2010, 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 "config.h"
-#include "Download.h"
-
-#include "DataReference.h"
-#include "DownloadAuthenticationClient.h"
-
-#pragma warning(push, 0)
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#pragma warning(pop)
-
-using namespace WebCore;
-
-namespace WebKit {
-
-// CFURLDownload Callbacks
-static void didStartCallback(CFURLDownloadRef download, const void* clientInfo);
-static CFURLRequestRef willSendRequestCallback(CFURLDownloadRef download, CFURLRequestRef request, CFURLResponseRef redirectionResponse, const void* clientInfo);
-static void didReceiveAuthenticationChallengeCallback(CFURLDownloadRef download, CFURLAuthChallengeRef challenge, const void* clientInfo);
-static void didReceiveResponseCallback(CFURLDownloadRef download, CFURLResponseRef response, const void* clientInfo);
-static void willResumeWithResponseCallback(CFURLDownloadRef download, CFURLResponseRef response, UInt64 startingByte, const void* clientInfo);
-static void didReceiveDataCallback(CFURLDownloadRef download, CFIndex length, const void* clientInfo);
-static Boolean shouldDecodeDataOfMIMETypeCallback(CFURLDownloadRef download, CFStringRef encodingType, const void* clientInfo);
-static void decideDestinationWithSuggestedObjectNameCallback(CFURLDownloadRef download, CFStringRef objectName, const void* clientInfo);
-static void didCreateDestinationCallback(CFURLDownloadRef download, CFURLRef path, const void* clientInfo);
-static void didFinishCallback(CFURLDownloadRef download, const void* clientInfo);
-static void didFailCallback(CFURLDownloadRef download, CFErrorRef error, const void* clientInfo);
-
-void Download::useCredential(const WebCore::AuthenticationChallenge& challenge, const WebCore::Credential& credential)
-{
-if (!m_download)
-return;
-RetainPtr cfCredential = adoptCF(createCF(credential));
-CFURLDownloadUseCredential(m_download.get(), cfCredential.get(), challenge.cfURLAuthChallengeRef());
-}
-
-void Download::continueWithoutC
[webkit-changes] [153478] trunk/Source/WebCore
Title: [153478] trunk/Source/WebCore
Revision 153478
Author par...@webkit.org
Date 2013-07-30 10:27:22 -0700 (Tue, 30 Jul 2013)
Log Message
Use OwnPtr in RenderThemeWin and ScrollbarThemeWin
https://bugs.webkit.org/show_bug.cgi?id=117978
Reviewed by Brent Fulgham.
Use OwnPtr to avoid manual deletion of objects.
* platform/win/ScrollbarThemeWin.cpp:
(WebCore::ScrollbarThemeWin::paintTrackPiece):
* rendering/RenderThemeWin.cpp:
(WebCore::drawControl):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp
trunk/Source/WebCore/rendering/RenderThemeWin.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (153477 => 153478)
--- trunk/Source/WebCore/ChangeLog 2013-07-30 17:01:40 UTC (rev 153477)
+++ trunk/Source/WebCore/ChangeLog 2013-07-30 17:27:22 UTC (rev 153478)
@@ -1,3 +1,17 @@
+2013-07-30 Patrick Gansterer
+
+Use OwnPtr in RenderThemeWin and ScrollbarThemeWin
+https://bugs.webkit.org/show_bug.cgi?id=117978
+
+Reviewed by Brent Fulgham.
+
+Use OwnPtr to avoid manual deletion of objects.
+
+* platform/win/ScrollbarThemeWin.cpp:
+(WebCore::ScrollbarThemeWin::paintTrackPiece):
+* rendering/RenderThemeWin.cpp:
+(WebCore::drawControl):
+
2013-07-30 Alex Christensen
Added include directories to Visual Studio for WebGL.
Modified: trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp (153477 => 153478)
--- trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp 2013-07-30 17:01:40 UTC (rev 153477)
+++ trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp 2013-07-30 17:27:22 UTC (rev 153478)
@@ -256,17 +256,15 @@
::FillRect(hdc, &themeRect, HBRUSH(COLOR_SCROLLBAR+1));
else {
static WORD patternBits[8] = { 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55 };
-HBITMAP patternBitmap = ::CreateBitmap(8, 8, 1, 1, patternBits);
-HBRUSH brush = ::CreatePatternBrush(patternBitmap);
+OwnPtr patternBitmap = adoptPtr(::CreateBitmap(8, 8, 1, 1, patternBits));
+OwnPtr brush = adoptPtr(::CreatePatternBrush(patternBitmap.get()));
SaveDC(hdc);
::SetTextColor(hdc, ::GetSysColor(COLOR_3DHILIGHT));
::SetBkColor(hdc, ::GetSysColor(COLOR_3DFACE));
::SetBrushOrgEx(hdc, rect.x(), rect.y(), NULL);
-::SelectObject(hdc, brush);
-::FillRect(hdc, &themeRect, brush);
+::SelectObject(hdc, brush.get());
+::FillRect(hdc, &themeRect, brush.get());
::RestoreDC(hdc, -1);
-::DeleteObject(brush);
-::DeleteObject(patternBitmap);
}
}
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (153477 => 153478)
--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2013-07-30 17:01:40 UTC (rev 153477)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2013-07-30 17:27:22 UTC (rev 153478)
@@ -694,23 +694,21 @@
::DrawEdge(hdc, &widgetRect, EDGE_RAISED, BF_RECT | BF_SOFT | BF_MIDDLE | BF_ADJUST);
if (themeData.m_state == TUS_DISABLED) {
static WORD patternBits[8] = {0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55};
-HBITMAP patternBmp = ::CreateBitmap(8, 8, 1, 1, patternBits);
+OwnPtr patternBmp = adoptPtr(::CreateBitmap(8, 8, 1, 1, patternBits));
if (patternBmp) {
-HBRUSH brush = (HBRUSH) ::CreatePatternBrush(patternBmp);
+OwnPtr brush = adoptPtr(::CreatePatternBrush(patternBmp.get()));
COLORREF oldForeColor = ::SetTextColor(hdc, ::GetSysColor(COLOR_3DFACE));
COLORREF oldBackColor = ::SetBkColor(hdc, ::GetSysColor(COLOR_3DHILIGHT));
POINT p;
::GetViewportOrgEx(hdc, &p);
::SetBrushOrgEx(hdc, p.x + widgetRect.left, p.y + widgetRect.top, NULL);
-HBRUSH oldBrush = (HBRUSH) ::SelectObject(hdc, brush);
-::FillRect(hdc, &widgetRect, brush);
+HGDIOBJ oldBrush = ::SelectObject(hdc, brush.get());
+::FillRect(hdc, &widgetRect, brush.get());
::SetTextColor(hdc, oldForeColor);
::SetBkColor(hdc, oldBackColor);
::SelectObject(hdc, oldBrush);
-::DeleteObject(brush);
} else
::FillRect(hdc, &widgetRect, (HBRUSH)COLOR_3DHILIGHT);
-::DeleteObject(patternBmp);
}
} else {
// Push buttons, buttons, checkboxes and radios, and the dropdown arrow in menulists.
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [152566] trunk/Source
Title: [152566] trunk/Source
Revision 152566
Author par...@webkit.org
Date 2013-07-11 04:43:53 -0700 (Thu, 11 Jul 2013)
Log Message
Remove unused Windows CE files
https://bugs.webkit.org/show_bug.cgi?id=118557
Reviewed by Andreas Kling.
Source/WebCore:
* platform/wince/CursorWinCE.cpp: Removed.
* platform/wince/PasteboardWinCE.cpp: Removed.
* platform/wince/SearchPopupMenuWinCE.cpp: Removed.
Source/WTF:
* wtf/wince/FastMallocWinCE.h: Removed.
* wtf/wince/MemoryManager.cpp: Removed.
* wtf/wince/MemoryManager.h: Removed.
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WebCore/ChangeLog
Removed Paths
trunk/Source/WTF/wtf/wince/FastMallocWinCE.h
trunk/Source/WTF/wtf/wince/MemoryManager.cpp
trunk/Source/WTF/wtf/wince/MemoryManager.h
trunk/Source/WebCore/platform/wince/CursorWinCE.cpp
trunk/Source/WebCore/platform/wince/PasteboardWinCE.cpp
trunk/Source/WebCore/platform/wince/SearchPopupMenuWinCE.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (152565 => 152566)
--- trunk/Source/WTF/ChangeLog 2013-07-11 11:19:20 UTC (rev 152565)
+++ trunk/Source/WTF/ChangeLog 2013-07-11 11:43:53 UTC (rev 152566)
@@ -1,3 +1,14 @@
+2013-07-11 Patrick Gansterer
+
+Remove unused Windows CE files
+https://bugs.webkit.org/show_bug.cgi?id=118557
+
+Reviewed by Andreas Kling.
+
+* wtf/wince/FastMallocWinCE.h: Removed.
+* wtf/wince/MemoryManager.cpp: Removed.
+* wtf/wince/MemoryManager.h: Removed.
+
2013-07-10 Michael Brüning
Workaround for x86 optimizer bug in MSVC 2012.
Deleted: trunk/Source/WTF/wtf/wince/FastMallocWinCE.h (152565 => 152566)
--- trunk/Source/WTF/wtf/wince/FastMallocWinCE.h 2013-07-11 11:19:20 UTC (rev 152565)
+++ trunk/Source/WTF/wtf/wince/FastMallocWinCE.h 2013-07-11 11:43:53 UTC (rev 152566)
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
- * Copyright (C) 2007-2009 Torch Mobile, Inc. All rights reserved
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef WTF_FastMallocWinCE_h
-#define WTF_FastMallocWinCE_h
-
-#include
-
-#ifdef __cplusplus
-#include
-#include
-extern "C" {
-#endif
-
-void* fastMalloc(size_t n);
-void* fastCalloc(size_t n_elements, size_t element_size);
-void fastFree(void* p);
-void* fastRealloc(void* p, size_t n);
-void* fastZeroedMalloc(size_t n);
-// These functions return 0 if an allocation fails.
-void* tryFastMalloc(size_t n);
-void* tryFastZeroedMalloc(size_t n);
-void* tryFastCalloc(size_t n_elements, size_t element_size);
-void* tryFastRealloc(void* p, size_t n);
-char* fastStrDup(const char*);
-
-#ifndef NDEBUG
-void fastMallocForbid();
-void fastMallocAllow();
-#endif
-
-#if !defined(USE_SYSTEM_MALLOC) || !USE_SYSTEM_MALLOC
-
-#define malloc(n) fastMalloc(n)
-#define calloc(n_elements, element_size)fastCalloc(n_elements, element_size)
-#define realloc(p, n) fastRealloc(p, n)
-#define free(p) fastFree(p)
-#define strdup(p) fastStrDup(p)
-
-#else
-
-#define strdup(p) _strdup(p)
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-#if !defined(USE_SYSTEM_MALLOC) || !USE_SYSTEM_MALLOC
-static inline void* __cdecl operator new(size_t s) { return fastMalloc(s); }
-static inline void __cdecl operator delete(void* p) { fastFree(p); }
-static inline void* __cdecl operator new[](size_t s) { return fastMalloc(s); }
-static inline void __cdecl operator delete[](void* p) { fastFree(p); }
-static inline void* operator new(size_t s, const std::nothrow_t&) throw() { return fastMalloc(s); }
-static inline void operator delete(void* p, const std::nothrow_t&) throw() { fastFree(p); }
-static inline void* operator new[](size_t s, const std::nothrow_t&) throw() { return fastMalloc(s); }
-static inline void operator delete[](void* p, const std::nothrow_t&) throw() { fastFree(p); }
-#endif
-
-namespace WTF {
-// This defines a type which holds an unsigned integer and is the same
-// size as the minimally aligned memory allocation.
-typedef unsigned long long AllocAlignmentInteger;
-
-namespace Internal {
-enum AllocType {/
[webkit-changes] [152564] trunk/Source/WebCore
Title: [152564] trunk/Source/WebCore Revision 152564 Author par...@webkit.org Date 2013-07-11 03:53:16 -0700 (Thu, 11 Jul 2013) Log Message Build fix for WinCE after r152426. * config.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/config.h Diff Modified: trunk/Source/WebCore/ChangeLog (152563 => 152564) --- trunk/Source/WebCore/ChangeLog 2013-07-11 10:28:43 UTC (rev 152563) +++ trunk/Source/WebCore/ChangeLog 2013-07-11 10:53:16 UTC (rev 152564) @@ -1,3 +1,9 @@ +2013-07-11 Patrick Gansterer + +Build fix for WinCE after r152426. + +* config.h: + 2013-07-11 Fabienne Semeria [Qt] memory leak in WebCore::FontCache::getLastResortFallbackFont Modified: trunk/Source/WebCore/config.h (152563 => 152564) --- trunk/Source/WebCore/config.h 2013-07-11 10:28:43 UTC (rev 152563) +++ trunk/Source/WebCore/config.h 2013-07-11 10:53:16 UTC (rev 152564) @@ -136,7 +136,7 @@ // FIXME: Move this to _javascript_Core/wtf/Platform.h, which is where we define WTF_USE_AVFOUNDATION on the Mac. // https://bugs.webkit.org/show_bug.cgi?id=67334 -#if PLATFORM(WIN) +#if PLATFORM(WIN) && !USE(WINGDI) #define WTF_USE_AVFOUNDATION 1 #if HAVE(AVCF_LEGIBLE_OUTPUT) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [152395] trunk/Source/JavaScriptCore
Title: [152395] trunk/Source/_javascript_Core
Revision 152395
Author par...@webkit.org
Date 2013-07-04 02:12:31 -0700 (Thu, 04 Jul 2013)
Log Message
[CMake] Add generation of JITStubs for x86_64 MSVC
https://bugs.webkit.org/show_bug.cgi?id=11
Reviewed by Laszlo Gombos.
Also move the generation for ARM CPU into the CMakeLists.txt,
since it's compiler specific and not dedicated to Windows CE.
* CMakeLists.txt:
* PlatformWinCE.cmake: Removed.
Modified Paths
trunk/Source/_javascript_Core/CMakeLists.txt
trunk/Source/_javascript_Core/ChangeLog
Removed Paths
trunk/Source/_javascript_Core/PlatformWinCE.cmake
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (152394 => 152395)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2013-07-04 09:05:05 UTC (rev 152394)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2013-07-04 09:12:31 UTC (rev 152395)
@@ -519,9 +519,34 @@
assembler/ARMv7Assembler.cpp
assembler/MacroAssemblerARM.cpp
)
+if (MSVC AND ENABLE_JIT)
+add_custom_command(
+OUTPUT ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
+MAIN_DEPENDENCY ${_javascript_CORE_DIR}/create_jit_stubs
+DEPENDS ${_javascript_CORE_DIR}/jit/JITStubs.cpp
+COMMAND ${PERL_EXECUTABLE} ${_javascript_CORE_DIR}/create_jit_stubs --prefix=MSVC ${_javascript_CORE_DIR}/jit/JITStubs.cpp > ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
+VERBATIM)
+
+add_custom_command(
+OUTPUT ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj
+MAIN_DEPENDENCY ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
+COMMAND armasm -nologo ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj
+VERBATIM)
+
+list(APPEND _javascript_Core_SOURCES ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj)
+endif ()
elseif (WTF_CPU_MIPS)
elseif (WTF_CPU_X86)
elseif (WTF_CPU_X86_64)
+if (MSVC AND ENABLE_JIT)
+add_custom_command(
+OUTPUT ${DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj
+MAIN_DEPENDENCY ${_javascript_CORE_DIR}/jit/JITStubsMSVC64.asm
+COMMAND ml64 -nologo -c -Fo ${DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj ${_javascript_CORE_DIR}/jit/JITStubsMSVC64.asm
+VERBATIM)
+
+list(APPEND _javascript_Core_SOURCES ${DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj)
+endif ()
else ()
message(FATAL_ERROR "Unknown CPU")
endif ()
Modified: trunk/Source/_javascript_Core/ChangeLog (152394 => 152395)
--- trunk/Source/_javascript_Core/ChangeLog 2013-07-04 09:05:05 UTC (rev 152394)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-07-04 09:12:31 UTC (rev 152395)
@@ -1,5 +1,18 @@
2013-07-04 Patrick Gansterer
+[CMake] Add generation of JITStubs for x86_64 MSVC
+https://bugs.webkit.org/show_bug.cgi?id=11
+
+Reviewed by Laszlo Gombos.
+
+Also move the generation for ARM CPU into the CMakeLists.txt,
+since it's compiler specific and not dedicated to Windows CE.
+
+* CMakeLists.txt:
+* PlatformWinCE.cmake: Removed.
+
+2013-07-04 Patrick Gansterer
+
[CMake] Add STATICALLY_LINKED_WITH_WTF to _javascript_Core project
https://bugs.webkit.org/show_bug.cgi?id=118120
Deleted: trunk/Source/_javascript_Core/PlatformWinCE.cmake (152394 => 152395)
--- trunk/Source/_javascript_Core/PlatformWinCE.cmake 2013-07-04 09:05:05 UTC (rev 152394)
+++ trunk/Source/_javascript_Core/PlatformWinCE.cmake 2013-07-04 09:12:31 UTC (rev 152395)
@@ -1,16 +0,0 @@
-if (ENABLE_JIT AND WTF_CPU_ARM)
-add_custom_command(
-OUTPUT ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
-MAIN_DEPENDENCY ${_javascript_CORE_DIR}/create_jit_stubs
-DEPENDS ${_javascript_CORE_DIR}/jit/JITStubs.cpp
-COMMAND ${PERL_EXECUTABLE} ${_javascript_CORE_DIR}/create_jit_stubs --prefix=MSVC ${_javascript_CORE_DIR}/jit/JITStubs.cpp > ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
-VERBATIM)
-
-add_custom_command(
-OUTPUT ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj
-MAIN_DEPENDENCY ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
-COMMAND armasm -nologo ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj
-VERBATIM)
-
-list(APPEND _javascript_Core_SOURCES ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj)
-endif ()
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [152393] trunk/Source/JavaScriptCore
Title: [152393] trunk/Source/_javascript_Core
Revision 152393
Author par...@webkit.org
Date 2013-07-04 01:52:31 -0700 (Thu, 04 Jul 2013)
Log Message
[CMake] Add STATICALLY_LINKED_WITH_WTF to _javascript_Core project
https://bugs.webkit.org/show_bug.cgi?id=118120
Reviewed by Gyuyoung Kim.
Since WTF is a static library linked to _javascript_Core on all CMake ports
we need to define STATICALLY_LINKED_WITH_WTF for all of them.
This makes only a difference for Windows, since WTF_EXPORT and WTF_IMPORT
are the same on all other platforms.
* CMakeLists.txt:
Modified Paths
trunk/Source/_javascript_Core/CMakeLists.txt
trunk/Source/_javascript_Core/ChangeLog
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (152392 => 152393)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2013-07-04 08:08:22 UTC (rev 152392)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2013-07-04 08:52:31 UTC (rev 152393)
@@ -536,7 +536,7 @@
WEBKIT_WRAP_SOURCELIST(${_javascript_Core_SOURCES})
include_directories(${_javascript_Core_INCLUDE_DIRECTORIES})
-add_definitions(-DBUILDING_JavaScriptCore)
+add_definitions(-DBUILDING_JavaScriptCore -DSTATICALLY_LINKED_WITH_WTF)
add_library(_javascript_Core ${_javascript_Core_LIBRARY_TYPE} ${_javascript_Core_HEADERS} ${_javascript_Core_SOURCES})
target_link_libraries(_javascript_Core ${_javascript_Core_LIBRARIES})
set_target_properties(_javascript_Core PROPERTIES FOLDER "_javascript_Core")
Modified: trunk/Source/_javascript_Core/ChangeLog (152392 => 152393)
--- trunk/Source/_javascript_Core/ChangeLog 2013-07-04 08:08:22 UTC (rev 152392)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-07-04 08:52:31 UTC (rev 152393)
@@ -1,3 +1,17 @@
+2013-07-04 Patrick Gansterer
+
+[CMake] Add STATICALLY_LINKED_WITH_WTF to _javascript_Core project
+https://bugs.webkit.org/show_bug.cgi?id=118120
+
+Reviewed by Gyuyoung Kim.
+
+Since WTF is a static library linked to _javascript_Core on all CMake ports
+we need to define STATICALLY_LINKED_WITH_WTF for all of them.
+This makes only a difference for Windows, since WTF_EXPORT and WTF_IMPORT
+are the same on all other platforms.
+
+* CMakeLists.txt:
+
2013-07-02 Mark Hahnenberg
Replace RELEASE_ASSERT with ASSERT in CodeBlock:: bytecodeOffsetForCallAtIndex
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [152392] trunk/Source/WebCore
Title: [152392] trunk/Source/WebCore
Revision 152392
Author par...@webkit.org
Date 2013-07-04 01:08:22 -0700 (Thu, 04 Jul 2013)
Log Message
Port FileSystemWin.cpp to WinCE
https://bugs.webkit.org/show_bug.cgi?id=117935
Reviewed by Brent Fulgham.
Add #if !OS(WINCE) around a few lines of the code, so it can be used by the WinCE port too.
* PlatformWinCE.cmake:
* platform/win/FileSystemWin.cpp:
(WebCore::storageDirectory):
* platform/wince/FileSystemWinCE.cpp: Removed.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/PlatformWinCE.cmake
trunk/Source/WebCore/platform/win/FileSystemWin.cpp
Removed Paths
trunk/Source/WebCore/platform/wince/FileSystemWinCE.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (152391 => 152392)
--- trunk/Source/WebCore/ChangeLog 2013-07-04 07:44:16 UTC (rev 152391)
+++ trunk/Source/WebCore/ChangeLog 2013-07-04 08:08:22 UTC (rev 152392)
@@ -1,3 +1,17 @@
+2013-07-04 Patrick Gansterer
+
+Port FileSystemWin.cpp to WinCE
+https://bugs.webkit.org/show_bug.cgi?id=117935
+
+Reviewed by Brent Fulgham.
+
+Add #if !OS(WINCE) around a few lines of the code, so it can be used by the WinCE port too.
+
+* PlatformWinCE.cmake:
+* platform/win/FileSystemWin.cpp:
+(WebCore::storageDirectory):
+* platform/wince/FileSystemWinCE.cpp: Removed.
+
2013-07-04 Balazs Kelemen
[GStreamer] support preload="metadata"
Modified: trunk/Source/WebCore/PlatformWinCE.cmake (152391 => 152392)
--- trunk/Source/WebCore/PlatformWinCE.cmake 2013-07-04 07:44:16 UTC (rev 152391)
+++ trunk/Source/WebCore/PlatformWinCE.cmake 2013-07-04 08:08:22 UTC (rev 152392)
@@ -43,6 +43,7 @@
platform/win/DragImageWin.cpp
platform/win/EditorWin.cpp
platform/win/EventLoopWin.cpp
+platform/win/FileSystemWin.cpp
platform/win/KeyEventWin.cpp
platform/win/LanguageWin.cpp
platform/win/LocalizedStringsWin.cpp
@@ -64,8 +65,6 @@
platform/win/WidgetWin.cpp
platform/win/WheelEventWin.cpp
-platform/wince/FileSystemWince.cpp
-
platform/network/NetworkStorageSessionStub.cpp
platform/network/win/CredentialStorageWin.cpp
Modified: trunk/Source/WebCore/platform/win/FileSystemWin.cpp (152391 => 152392)
--- trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2013-07-04 07:44:16 UTC (rev 152391)
+++ trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2013-07-04 08:08:22 UTC (rev 152392)
@@ -253,6 +253,9 @@
static String storageDirectory(DWORD pathIdentifier)
{
+#if OS(WINCE)
+return String();
+#else
Vector buffer(MAX_PATH);
if (FAILED(SHGetFolderPathW(0, pathIdentifier | CSIDL_FLAG_CREATE, 0, 0, buffer.data(
return String();
@@ -265,6 +268,7 @@
return String();
return directory;
+#endif
}
static String cachedStorageDirectory(DWORD pathIdentifier)
Deleted: trunk/Source/WebCore/platform/wince/FileSystemWinCE.cpp (152391 => 152392)
--- trunk/Source/WebCore/platform/wince/FileSystemWinCE.cpp 2013-07-04 07:44:16 UTC (rev 152391)
+++ trunk/Source/WebCore/platform/wince/FileSystemWinCE.cpp 2013-07-04 08:08:22 UTC (rev 152392)
@@ -1,345 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
- * Copyright (C) 2008 Collabora, Ltd. All rights reserved.
- * Copyright (C) 2007-2009 Torch Mobile, Inc.
- *
- * 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.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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 "config.h"
-#include "FileSystem.h"
-
-#include "FileMetadata.h"
-#include "NotImplemented.h"
-#includ
[webkit-changes] [152079] trunk/Source/WebKit/wince
Title: [152079] trunk/Source/WebKit/wince
Revision 152079
Author par...@webkit.org
Date 2013-06-26 23:15:39 -0700 (Wed, 26 Jun 2013)
Log Message
Unreviewed WinCE build fix after r152065.
* WebCoreSupport/ChromeClientWinCE.cpp:
(WebKit::ChromeClientWinCE::AXStartFrameLoad):
(WebKit::ChromeClientWinCE::AXFinishFrameLoad):
* WebCoreSupport/ChromeClientWinCE.h:
Modified Paths
trunk/Source/WebKit/wince/ChangeLog
trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp
trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h
Diff
Modified: trunk/Source/WebKit/wince/ChangeLog (152078 => 152079)
--- trunk/Source/WebKit/wince/ChangeLog 2013-06-27 06:02:51 UTC (rev 152078)
+++ trunk/Source/WebKit/wince/ChangeLog 2013-06-27 06:15:39 UTC (rev 152079)
@@ -1,3 +1,12 @@
+2013-06-26 Patrick Gansterer
+
+Unreviewed WinCE build fix after r152065.
+
+* WebCoreSupport/ChromeClientWinCE.cpp:
+(WebKit::ChromeClientWinCE::AXStartFrameLoad):
+(WebKit::ChromeClientWinCE::AXFinishFrameLoad):
+* WebCoreSupport/ChromeClientWinCE.h:
+
2013-05-19 Anders Carlsson
Remove ChromeClient::webView()
Modified: trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp (152078 => 152079)
--- trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp 2013-06-27 06:02:51 UTC (rev 152078)
+++ trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp 2013-06-27 06:15:39 UTC (rev 152079)
@@ -364,6 +364,16 @@
notImplemented();
}
+void ChromeClientWinCE::AXStartFrameLoad()
+{
+notImplemented();
+}
+
+void ChromeClientWinCE::AXFinishFrameLoad()
+{
+notImplemented();
+}
+
void ChromeClientWinCE::formStateDidChange(const Node*)
{
notImplemented();
Modified: trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h (152078 => 152079)
--- trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h 2013-06-27 06:02:51 UTC (rev 152078)
+++ trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h 2013-06-27 06:15:39 UTC (rev 152079)
@@ -154,6 +154,8 @@
#endif
virtual void setLastSetCursorToCurrentCursor();
+virtual void AXStartFrameLoad();
+virtual void AXFinishFrameLoad();
#if ENABLE(TOUCH_EVENTS)
virtual void needTouchEvents(bool);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [151910] trunk/Source/WebCore
Title: [151910] trunk/Source/WebCore
Revision 151910
Author par...@webkit.org
Date 2013-06-24 08:09:35 -0700 (Mon, 24 Jun 2013)
Log Message
Cleanup RenderThemeWin after r151783 and r151794.
https://bugs.webkit.org/show_bug.cgi?id=117936
Reviewed by Alexis Menard.
GetSysColor() takes an integer as argument. Let cssValueIdToSysColorIndex()
return an int instead of casting the values to the CSSValueID type.
* rendering/RenderThemeWin.cpp:
(WebCore::cssValueIdToSysColorIndex):
(WebCore::RenderThemeWin::systemColor):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderThemeWin.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (151909 => 151910)
--- trunk/Source/WebCore/ChangeLog 2013-06-24 14:16:42 UTC (rev 151909)
+++ trunk/Source/WebCore/ChangeLog 2013-06-24 15:09:35 UTC (rev 151910)
@@ -1,5 +1,19 @@
2013-06-24 Patrick Gansterer
+Cleanup RenderThemeWin after r151783 and r151794.
+https://bugs.webkit.org/show_bug.cgi?id=117936
+
+Reviewed by Alexis Menard.
+
+GetSysColor() takes an integer as argument. Let cssValueIdToSysColorIndex()
+return an int instead of casting the values to the CSSValueID type.
+
+* rendering/RenderThemeWin.cpp:
+(WebCore::cssValueIdToSysColorIndex):
+(WebCore::RenderThemeWin::systemColor):
+
+2013-06-24 Patrick Gansterer
+
Use SetFilePointer instead of SetFilePointerEx in FileSystemWin
https://bugs.webkit.org/show_bug.cgi?id=116205
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (151909 => 151910)
--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2013-06-24 14:16:42 UTC (rev 151909)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2013-06-24 15:09:35 UTC (rev 151910)
@@ -1034,45 +1034,45 @@
}
// Map a CSSValue* system color to an index understood by GetSysColor
-static CSSValueID cssValueIdToSysColorIndex(int cssValueId)
+static int cssValueIdToSysColorIndex(CSSValueID cssValueId)
{
switch (cssValueId) {
-case CSSValueActiveborder: return static_cast(COLOR_ACTIVEBORDER);
-case CSSValueActivecaption: return static_cast(COLOR_ACTIVECAPTION);
-case CSSValueAppworkspace: return static_cast(COLOR_APPWORKSPACE);
-case CSSValueBackground: return static_cast(COLOR_BACKGROUND);
-case CSSValueButtonface: return static_cast(COLOR_BTNFACE);
-case CSSValueButtonhighlight: return static_cast(COLOR_BTNHIGHLIGHT);
-case CSSValueButtonshadow: return static_cast(COLOR_BTNSHADOW);
-case CSSValueButtontext: return static_cast(COLOR_BTNTEXT);
-case CSSValueCaptiontext: return static_cast(COLOR_CAPTIONTEXT);
-case CSSValueGraytext: return static_cast(COLOR_GRAYTEXT);
-case CSSValueHighlight: return static_cast(COLOR_HIGHLIGHT);
-case CSSValueHighlighttext: return static_cast(COLOR_HIGHLIGHTTEXT);
-case CSSValueInactiveborder: return static_cast(COLOR_INACTIVEBORDER);
-case CSSValueInactivecaption: return static_cast(COLOR_INACTIVECAPTION);
-case CSSValueInactivecaptiontext: return static_cast(COLOR_INACTIVECAPTIONTEXT);
-case CSSValueInfobackground: return static_cast(COLOR_INFOBK);
-case CSSValueInfotext: return static_cast(COLOR_INFOTEXT);
-case CSSValueMenu: return static_cast(COLOR_MENU);
-case CSSValueMenutext: return static_cast(COLOR_MENUTEXT);
-case CSSValueScrollbar: return static_cast(COLOR_SCROLLBAR);
-case CSSValueThreeddarkshadow: return static_cast(COLOR_3DDKSHADOW);
-case CSSValueThreedface: return static_cast(COLOR_3DFACE);
-case CSSValueThreedhighlight: return static_cast(COLOR_3DHIGHLIGHT);
-case CSSValueThreedlightshadow: return static_cast(COLOR_3DLIGHT);
-case CSSValueThreedshadow: return static_cast(COLOR_3DSHADOW);
-case CSSValueWindow: return static_cast(COLOR_WINDOW);
-case CSSValueWindowframe: return static_cast(COLOR_WINDOWFRAME);
-case CSSValueWindowtext: return static_cast(COLOR_WINDOWTEXT);
-default: return CSSValueInvalid; // Unsupported CSSValue
+case CSSValueActiveborder: return COLOR_ACTIVEBORDER;
+case CSSValueActivecaption: return COLOR_ACTIVECAPTION;
+case CSSValueAppworkspace: return COLOR_APPWORKSPACE;
+case CSSValueBackground: return COLOR_BACKGROUND;
+case CSSValueButtonface: return COLOR_BTNFACE;
+case CSSValueButtonhighlight: return COLOR_BTNHIGHLIGHT;
+case CSSValueButtonshadow: return COLOR_BTNSHADOW;
+case CSSValueButtontext: return COLOR_BTNTEXT;
+case CSSValueCaptiontext: return COLOR_CAPTIONTEXT;
+case CSSValueGraytext: return COLOR_GRAYTEXT;
+case CSSValueHighlight: return COLOR_HIGHLIGHT;
+case CSSValueHighlighttext: return COLOR_HIGHLIGHTTEXT;
+case CSSValueInactiveborder: return COLOR_INACTIVEBORDER;
+case CSSValueInactivecaption: return COLOR_INACTIVECAPTION;
+case CSSValueInactivecaptiontext: return COLOR_INACTIVECAPTIONTEXT;
+case CSSValueInfobackground: return COLOR_INFOBK;
+case CSSValueInfotex
[webkit-changes] [151909] trunk/Source/WebCore
Title: [151909] trunk/Source/WebCore Revision 151909 Author par...@webkit.org Date 2013-06-24 07:16:42 -0700 (Mon, 24 Jun 2013) Log Message Use SetFilePointer instead of SetFilePointerEx in FileSystemWin https://bugs.webkit.org/show_bug.cgi?id=116205 Reviewed by Ryosuke Niwa. SetFilePointerEx is not available on Windows CE, so use SetFilePointer. Also add a extra return for the case of an failure. * platform/win/FileSystemWin.cpp: (WebCore::seekFile): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/win/FileSystemWin.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (151908 => 151909) --- trunk/Source/WebCore/ChangeLog 2013-06-24 14:07:53 UTC (rev 151908) +++ trunk/Source/WebCore/ChangeLog 2013-06-24 14:16:42 UTC (rev 151909) @@ -1,3 +1,16 @@ +2013-06-24 Patrick Gansterer + +Use SetFilePointer instead of SetFilePointerEx in FileSystemWin +https://bugs.webkit.org/show_bug.cgi?id=116205 + +Reviewed by Ryosuke Niwa. + +SetFilePointerEx is not available on Windows CE, so use SetFilePointer. +Also add a extra return for the case of an failure. + +* platform/win/FileSystemWin.cpp: +(WebCore::seekFile): + 2013-06-24 Christophe Dumez Introduce WindowTimers IDL interface Modified: trunk/Source/WebCore/platform/win/FileSystemWin.cpp (151908 => 151909) --- trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2013-06-24 14:07:53 UTC (rev 151908) +++ trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2013-06-24 14:16:42 UTC (rev 151909) @@ -359,12 +359,12 @@ LARGE_INTEGER largeOffset; largeOffset.QuadPart = offset; -LARGE_INTEGER newOffset; -newOffset.QuadPart = 0; +largeOffset.LowPart = SetFilePointer(handle, largeOffset.LowPart, &largeOffset.HighPart, moveMethod); -SetFilePointerEx(handle, largeOffset, &newOffset, moveMethod); +if (largeOffset.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) +return -1; -return newOffset.QuadPart; +return largeOffset.QuadPart; } int writeToFile(PlatformFileHandle handle, const char* data, int length) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [151907] trunk/Source/WebCore
Title: [151907] trunk/Source/WebCore Revision 151907 Author par...@webkit.org Date 2013-06-24 06:58:22 -0700 (Mon, 24 Jun 2013) Log Message Build fix for WinCE after r151563. * bindings/js/JSDOMBinding.cpp: (WebCore::toInt8): Use fabs() instead of abs(). (WebCore::toUInt8): Ditto. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (151906 => 151907) --- trunk/Source/WebCore/ChangeLog 2013-06-24 13:09:08 UTC (rev 151906) +++ trunk/Source/WebCore/ChangeLog 2013-06-24 13:58:22 UTC (rev 151907) @@ -1,5 +1,13 @@ 2013-06-24 Patrick Gansterer +Build fix for WinCE after r151563. + +* bindings/js/JSDOMBinding.cpp: +(WebCore::toInt8): Use fabs() instead of abs(). +(WebCore::toUInt8): Ditto. + +2013-06-24 Patrick Gansterer + Build fix for WinCE after r151783. * rendering/RenderThemeWinCE.cpp: Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp (151906 => 151907) --- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2013-06-24 13:09:08 UTC (rev 151906) +++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2013-06-24 13:58:22 UTC (rev 151907) @@ -335,7 +335,7 @@ if (std::isnan(x) || std::isinf(x) || !x) return 0; -x = x < 0 ? -floor(abs(x)) : floor(abs(x)); +x = x < 0 ? -floor(fabs(x)) : floor(fabs(x)); x = fmod(x, 256); // 2^8. return static_cast(x > kMaxInt8 ? x - 256 : x); @@ -366,7 +366,7 @@ if (std::isnan(x) || std::isinf(x) || !x) return 0; -x = x < 0 ? -floor(abs(x)) : floor(abs(x)); +x = x < 0 ? -floor(fabs(x)) : floor(fabs(x)); return static_cast(fmod(x, 256)); // 2^8. } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [151906] trunk/Source/WebCore
Title: [151906] trunk/Source/WebCore
Revision 151906
Author par...@webkit.org
Date 2013-06-24 06:09:08 -0700 (Mon, 24 Jun 2013)
Log Message
Build fix for WinCE after r151783.
* rendering/RenderThemeWinCE.cpp:
(WebCore::cssValueIdToSysColorIndex):
(WebCore::RenderThemeWinCE::systemColor):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (151905 => 151906)
--- trunk/Source/WebCore/ChangeLog 2013-06-24 12:31:34 UTC (rev 151905)
+++ trunk/Source/WebCore/ChangeLog 2013-06-24 13:09:08 UTC (rev 151906)
@@ -1,3 +1,11 @@
+2013-06-24 Patrick Gansterer
+
+Build fix for WinCE after r151783.
+
+* rendering/RenderThemeWinCE.cpp:
+(WebCore::cssValueIdToSysColorIndex):
+(WebCore::RenderThemeWinCE::systemColor):
+
2013-06-24 Commit Queue
Unreviewed, rolling out r151021.
Modified: trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp (151905 => 151906)
--- trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2013-06-24 12:31:34 UTC (rev 151905)
+++ trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2013-06-24 13:09:08 UTC (rev 151906)
@@ -284,7 +284,7 @@
}
// Map a CSSValue* system color to an index understood by GetSysColor
-static CSSValueID cssValueIdToSysColorIndex(CSSValueID cssValueId)
+static int cssValueIdToSysColorIndex(CSSValueID cssValueId)
{
switch (cssValueId) {
case CSSValueActiveborder: return COLOR_ACTIVEBORDER;
@@ -315,14 +315,14 @@
case CSSValueWindow: return COLOR_WINDOW;
case CSSValueWindowframe: return COLOR_WINDOWFRAME;
case CSSValueWindowtext: return COLOR_WINDOWTEXT;
-default: return CSSValueInvalid; // Unsupported CSSValue
+default: return -1; // Unsupported CSSValue
}
}
Color RenderThemeWinCE::systemColor(CSSValueID cssValueId) const
{
-CSSValueID sysColorIndex = cssValueIdToSysColorIndex(cssValueId);
-if (sysColorIndex == CSSValueInvalid)
+int sysColorIndex = cssValueIdToSysColorIndex(cssValueId);
+if (sysColorIndex == -1)
return RenderTheme::systemColor(cssValueId);
COLORREF color = GetSysColor(sysColorIndex);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [151610] trunk
Title: [151610] trunk Revision 151610 Author par...@webkit.org Date 2013-06-14 15:49:14 -0700 (Fri, 14 Jun 2013) Log Message Introduce USE(WINGDI) for the Windows port https://bugs.webkit.org/show_bug.cgi?id=116138 Reviewed by Ryosuke Niwa. Using USE(WINGDI) instead of OS(WINCE) will allow us to compile the GDI based Windows port on WinNT too. .: * Source/cmake/OptionsWinCE.cmake: Source/WebCore: * config.h: * platform/graphics/BitmapImage.h: * platform/graphics/FontPlatformData.h: * platform/graphics/GlyphBuffer.h: (WebCore): (GlyphBuffer): * platform/graphics/Gradient.h: (Gradient): * platform/graphics/GraphicsContext.cpp: (WebCore): * platform/graphics/GraphicsContext.h: (WebCore): (GraphicsContext): * platform/graphics/ImageBufferData.h: * platform/graphics/NativeImagePtr.h: (WebCore): * platform/graphics/Path.h: * platform/graphics/Pattern.h: * plugins/win/PluginViewWin.cpp: (WebCore::PluginView::paintWindowedPluginIntoContext): (WebCore::PluginView::paint): (WebCore::PluginView::snapshot): Source/WTF: * wtf/Platform.h: Modified Paths trunk/ChangeLog trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/Platform.h trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/config.h trunk/Source/WebCore/platform/graphics/BitmapImage.h trunk/Source/WebCore/platform/graphics/FontPlatformData.h trunk/Source/WebCore/platform/graphics/GlyphBuffer.h trunk/Source/WebCore/platform/graphics/Gradient.h trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp trunk/Source/WebCore/platform/graphics/GraphicsContext.h trunk/Source/WebCore/platform/graphics/ImageBufferData.h trunk/Source/WebCore/platform/graphics/NativeImagePtr.h trunk/Source/WebCore/platform/graphics/Path.h trunk/Source/WebCore/platform/graphics/Pattern.h trunk/Source/WebCore/plugins/win/PluginViewWin.cpp trunk/Source/cmake/OptionsWinCE.cmake Diff Modified: trunk/ChangeLog (151609 => 151610) --- trunk/ChangeLog 2013-06-14 22:40:10 UTC (rev 151609) +++ trunk/ChangeLog 2013-06-14 22:49:14 UTC (rev 151610) @@ -1,3 +1,15 @@ +2013-06-14 Patrick Gansterer + +Introduce USE(WINGDI) for the Windows port +https://bugs.webkit.org/show_bug.cgi?id=116138 + +Reviewed by Ryosuke Niwa. + +Using USE(WINGDI) instead of OS(WINCE) will allow us to +compile the GDI based Windows port on WinNT too. + +* Source/cmake/OptionsWinCE.cmake: + 2013-06-14 Manuel Rego Casasnovas [GTK][WK1] Missing symbols Modified: trunk/Source/WTF/ChangeLog (151609 => 151610) --- trunk/Source/WTF/ChangeLog 2013-06-14 22:40:10 UTC (rev 151609) +++ trunk/Source/WTF/ChangeLog 2013-06-14 22:49:14 UTC (rev 151610) @@ -1,3 +1,15 @@ +2013-06-14 Patrick Gansterer + +Introduce USE(WINGDI) for the Windows port +https://bugs.webkit.org/show_bug.cgi?id=116138 + +Reviewed by Ryosuke Niwa. + +Using USE(WINGDI) instead of OS(WINCE) will allow us to +compile the GDI based Windows port on WinNT too. + +* wtf/Platform.h: + 2013-06-13 Ryosuke Niwa Remove LiteralIdentifierTable Modified: trunk/Source/WTF/wtf/Platform.h (151609 => 151610) --- trunk/Source/WTF/wtf/Platform.h 2013-06-14 22:40:10 UTC (rev 151609) +++ trunk/Source/WTF/wtf/Platform.h 2013-06-14 22:49:14 UTC (rev 151610) @@ -551,11 +551,11 @@ #define WTF_USE_WEB_THREAD 1 #endif /* PLATFORM(IOS) */ -#if PLATFORM(WIN) && !OS(WINCE) +#if PLATFORM(WIN) && !USE(WINGDI) #define WTF_USE_CF 1 #endif -#if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO) +#if PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO) #define WTF_USE_CFNETWORK 1 #endif @@ -861,7 +861,7 @@ #endif /* Accelerated compositing */ -#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO)) +#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO)) #define WTF_USE_ACCELERATED_COMPOSITING 1 #endif @@ -972,7 +972,7 @@ #define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1 #endif -#if PLATFORM(MAC) || PLATFORM(GTK) || (PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO)) +#if PLATFORM(MAC) || PLATFORM(GTK) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO)) #define WTF_USE_REQUEST_ANIMATION_FRAME_TIMER 1 #endif Modified: trunk/Source/WebCore/ChangeLog (151609 => 151610) --- trunk/Source/WebCore/ChangeLog 2013-06-14 22:40:10 UTC (rev 151609) +++ trunk/Source/WebCore/ChangeLog 2013-06-14 22:49:14 UTC (rev 151610) @@ -1,3 +1,36 @@ +2013-06-14 Patrick Gansterer + +Introduce USE(WINGDI) for the Windows port +https://bugs.webkit.org/show_bug.cgi?id=116138 + +Reviewed by Ryosuke Niwa. + +Using USE(WINGDI) instead of OS(WINCE) will allow us to +compile the GDI based Windows port on WinNT too. + +* config.h: +* platform/graphics/BitmapImage.h: +* platform/graphics/FontPlatformData.h: +* platform/graphics/GlyphBuffer.h: +(WebCore): +(Glyp
[webkit-changes] [151102] trunk/Source/WTF
Title: [151102] trunk/Source/WTF
Revision 151102
Author par...@webkit.org
Date 2013-06-03 05:38:03 -0700 (Mon, 03 Jun 2013)
Log Message
Unreviewed WinCE build fix after r150833.
* wtf/DateMath.cpp:
(WTF::calculateDSTOffset):
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/DateMath.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (151101 => 151102)
--- trunk/Source/WTF/ChangeLog 2013-06-03 11:47:46 UTC (rev 151101)
+++ trunk/Source/WTF/ChangeLog 2013-06-03 12:38:03 UTC (rev 151102)
@@ -1,3 +1,10 @@
+2013-06-03 Patrick Gansterer
+
+Unreviewed WinCE build fix after r150833.
+
+* wtf/DateMath.cpp:
+(WTF::calculateDSTOffset):
+
2013-06-03 Gyuyoung Kim
[WTF] Add OwnArrayPtr vectortraits template
Modified: trunk/Source/WTF/wtf/DateMath.cpp (151101 => 151102)
--- trunk/Source/WTF/wtf/DateMath.cpp 2013-06-03 11:47:46 UTC (rev 151101)
+++ trunk/Source/WTF/wtf/DateMath.cpp 2013-06-03 12:38:03 UTC (rev 151102)
@@ -423,7 +423,7 @@
static double calculateDSTOffset(time_t localTime, double utcOffset)
{
#if OS(WINCE)
-UNUSED_PARAM(localTimeSeconds);
+UNUSED_PARAM(localTime);
UNUSED_PARAM(utcOffset);
return 0;
#else
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150789] trunk/Source/WebCore
Title: [150789] trunk/Source/WebCore Revision 150789 Author par...@webkit.org Date 2013-05-28 00:02:38 -0700 (Tue, 28 May 2013) Log Message Build fix for WinCE after r150730. * platform/graphics/FontFallbackList.cpp: (WebCore::FontGlyphs::glyphDataAndPageForCharacter): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/graphics/FontFallbackList.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (150788 => 150789) --- trunk/Source/WebCore/ChangeLog 2013-05-28 06:57:20 UTC (rev 150788) +++ trunk/Source/WebCore/ChangeLog 2013-05-28 07:02:38 UTC (rev 150789) @@ -1,5 +1,12 @@ 2013-05-27 Patrick Gansterer +Build fix for WinCE after r150730. + +* platform/graphics/FontFallbackList.cpp: +(WebCore::FontGlyphs::glyphDataAndPageForCharacter): + +2013-05-27 Patrick Gansterer + Build fix for WinCE after r150772. * platform/win/ClipboardWin.cpp: Modified: trunk/Source/WebCore/platform/graphics/FontFallbackList.cpp (150788 => 150789) --- trunk/Source/WebCore/platform/graphics/FontFallbackList.cpp 2013-05-28 06:57:20 UTC (rev 150788) +++ trunk/Source/WebCore/platform/graphics/FontFallbackList.cpp 2013-05-28 07:02:38 UTC (rev 150789) @@ -387,8 +387,8 @@ // display the character, probably because the font package is not installed correctly. // So we just always set the glyph to be same as the character, and let GDI solve it. page->setGlyphDataForCharacter(c, c, characterFontData.get()); -characterFontData->setMaxGlyphPageTreeLevel(max(characterFontData->maxGlyphPageTreeLevel(), node->level())); -return make_pair(page->glyphDataForCharacter(c), page); +characterFontData->setMaxGlyphPageTreeLevel(std::max(characterFontData->maxGlyphPageTreeLevel(), node->level())); +return std::make_pair(page->glyphDataForCharacter(c), page); #else page->setGlyphDataForCharacter(c, data.glyph, data.fontData); data.fontData->setMaxGlyphPageTreeLevel(std::max(data.fontData->maxGlyphPageTreeLevel(), node->level())); @@ -406,8 +406,8 @@ #if OS(WINCE) // See comment about WINCE GDI handling near setGlyphDataForCharacter above. page->setGlyphDataForCharacter(c, c, data.fontData); -data.fontData->setMaxGlyphPageTreeLevel(max(data.fontData->maxGlyphPageTreeLevel(), node->level())); -return make_pair(page->glyphDataForCharacter(c), page); +data.fontData->setMaxGlyphPageTreeLevel(std::max(data.fontData->maxGlyphPageTreeLevel(), node->level())); +return std::make_pair(page->glyphDataForCharacter(c), page); #else page->setGlyphDataForCharacter(c, data.glyph, data.fontData); data.fontData->setMaxGlyphPageTreeLevel(std::max(data.fontData->maxGlyphPageTreeLevel(), node->level())); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150788] trunk/Source/WebCore
Title: [150788] trunk/Source/WebCore
Revision 150788
Author par...@webkit.org
Date 2013-05-27 23:57:20 -0700 (Mon, 27 May 2013)
Log Message
Build fix for WinCE after r150772.
* platform/win/ClipboardWin.cpp:
(WebCore):
* platform/win/PasteboardWin.cpp:
(WebCore::Pasteboard::readFilenames):
(WebCore):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/win/ClipboardWin.cpp
trunk/Source/WebCore/platform/win/PasteboardWin.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (150787 => 150788)
--- trunk/Source/WebCore/ChangeLog 2013-05-28 06:48:24 UTC (rev 150787)
+++ trunk/Source/WebCore/ChangeLog 2013-05-28 06:57:20 UTC (rev 150788)
@@ -1,3 +1,13 @@
+2013-05-27 Patrick Gansterer
+
+Build fix for WinCE after r150772.
+
+* platform/win/ClipboardWin.cpp:
+(WebCore):
+* platform/win/PasteboardWin.cpp:
+(WebCore::Pasteboard::readFilenames):
+(WebCore):
+
2013-05-27 Darin Adler
Fix build.
Modified: trunk/Source/WebCore/platform/win/ClipboardWin.cpp (150787 => 150788)
--- trunk/Source/WebCore/platform/win/ClipboardWin.cpp 2013-05-28 06:48:24 UTC (rev 150787)
+++ trunk/Source/WebCore/platform/win/ClipboardWin.cpp 2013-05-28 06:57:20 UTC (rev 150788)
@@ -34,6 +34,7 @@
#include "Frame.h"
#include "HTMLNames.h"
#include "HTMLParserIdioms.h"
+#include "NotImplemented.h"
#include "Pasteboard.h"
#include "markup.h"
@@ -57,6 +58,7 @@
return result;
}
+#if ENABLE(DRAG_SUPPORT)
void Clipboard::declareAndWriteDragImage(Element* element, const KURL& url, const String& title, Frame* frame)
{
// Order is important here for Explorer's sake
@@ -81,5 +83,6 @@
if (medium.hGlobal && FAILED(m_pasteboard->writableDataObject()->SetData(htmlFormat(), &medium, TRUE)))
::GlobalFree(medium.hGlobal);
}
+#endif
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/win/PasteboardWin.cpp (150787 => 150788)
--- trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2013-05-28 06:48:24 UTC (rev 150787)
+++ trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2013-05-28 06:57:20 UTC (rev 150788)
@@ -307,9 +307,9 @@
Vector Pasteboard::readFilenames()
{
-#if USE(CF)
Vector fileNames;
+#if USE(CF)
if (m_dataObject) {
STGMEDIUM medium;
if (FAILED(m_dataObject->GetData(cfHDropFormat(), &medium)))
@@ -336,7 +336,7 @@
return m_dragDataMap.get(cfHDropFormat()->cfFormat);
#else
notImplemented();
-return 0;
+return fileNames;
#endif
}
@@ -411,10 +411,12 @@
return false;
}
+#if ENABLE(DRAG_SUPPORT)
void Pasteboard::setDragImage(DragImageRef, const IntPoint&)
{
// Do nothing in Windows.
}
+#endif
void Pasteboard::writeRangeToDataObject(Range* selectedRange, Frame* frame)
{
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150786] trunk/Source/WTF
Title: [150786] trunk/Source/WTF Revision 150786 Author par...@webkit.org Date 2013-05-27 23:31:48 -0700 (Mon, 27 May 2013) Log Message Use correct stack size on Solaris and OpenBSD https://bugs.webkit.org/show_bug.cgi?id=114978 Recommit after wrong rollout in r150621. * wtf/StackBounds.cpp: (WTF): (WTF::StackBounds::initialize): Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/StackBounds.cpp Diff Modified: trunk/Source/WTF/ChangeLog (150785 => 150786) --- trunk/Source/WTF/ChangeLog 2013-05-28 00:02:46 UTC (rev 150785) +++ trunk/Source/WTF/ChangeLog 2013-05-28 06:31:48 UTC (rev 150786) @@ -1,5 +1,16 @@ 2013-05-27 Patrick Gansterer +Use correct stack size on Solaris and OpenBSD +https://bugs.webkit.org/show_bug.cgi?id=114978 + +Recommit after wrong rollout in r150621. + +* wtf/StackBounds.cpp: +(WTF): +(WTF::StackBounds::initialize): + +2013-05-27 Patrick Gansterer + Use ICU_INCLUDE_DIRS in BlackBerry CMake files https://bugs.webkit.org/show_bug.cgi?id=116210 Modified: trunk/Source/WTF/wtf/StackBounds.cpp (150785 => 150786) --- trunk/Source/WTF/wtf/StackBounds.cpp 2013-05-28 00:02:46 UTC (rev 150785) +++ trunk/Source/WTF/wtf/StackBounds.cpp 2013-05-28 06:31:48 UTC (rev 150786) @@ -58,12 +58,12 @@ // Bug 26276 - Need a mechanism to determine stack extent // // These platforms should now be working correctly: -// DARWIN, QNX, UNIX +// DARWIN, OPENBSD, QNX, SOLARIS, UNIX // These platforms are not: -// WINDOWS, SOLARIS, OPENBSD, WINCE +// WINDOWS, WINCE // // FIXME: remove this! - this code unsafely guesses at stack sizes! -#if OS(WINDOWS) || OS(SOLARIS) || OS(OPENBSD) +#if OS(WINDOWS) // Based on the current limit used by the JSC parser, guess the stack size. static const ptrdiff_t estimatedStackSize = 128 * sizeof(void*) * 1024; // This method assumes the stack is growing downwards. @@ -124,7 +124,7 @@ stack_t s; thr_stksegment(&s); m_origin = s.ss_sp; -m_bound = estimateStackBound(m_origin); +m_bound = static_cast(m_origin) - s.ss_size; } #elif OS(OPENBSD) @@ -135,7 +135,11 @@ stack_t stack; pthread_stackseg_np(thread, &stack); m_origin = stack.ss_sp; -m_bound = estimateStackBound(m_origin); +#if CPU(HPPA) +m_bound = static_cast(m_origin) + stack.ss_size; +#else +m_bound = static_cast(m_origin) - stack.ss_size; +#endif } #elif OS(UNIX) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150767] trunk
Title: [150767] trunk
Revision 150767
Author par...@webkit.org
Date 2013-05-27 11:09:51 -0700 (Mon, 27 May 2013)
Log Message
Use ICU_INCLUDE_DIRS in BlackBerry CMake files
https://bugs.webkit.org/show_bug.cgi?id=116210
Reviewed by Rob Buis.
Set and use the ICU_INCLUDE_DIRS variable to avoid
duplicated adding of the ICU include directory.
.:
* Source/cmake/OptionsBlackBerry.cmake:
Source/_javascript_Core:
* PlatformBlackBerry.cmake:
Source/WebCore:
* PlatformBlackBerry.cmake:
Source/WebKit:
* PlatformBlackBerry.cmake:
Source/WTF:
* wtf/PlatformBlackBerry.cmake:
Modified Paths
trunk/ChangeLog
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/PlatformBlackBerry.cmake
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/PlatformBlackBerry.cmake
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/PlatformBlackBerry.cmake
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/PlatformBlackBerry.cmake
trunk/Source/cmake/OptionsBlackBerry.cmake
Diff
Modified: trunk/ChangeLog (150766 => 150767)
--- trunk/ChangeLog 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/ChangeLog 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,3 +1,15 @@
+2013-05-27 Patrick Gansterer
+
+Use ICU_INCLUDE_DIRS in BlackBerry CMake files
+https://bugs.webkit.org/show_bug.cgi?id=116210
+
+Reviewed by Rob Buis.
+
+Set and use the ICU_INCLUDE_DIRS variable to avoid
+duplicated adding of the ICU include directory.
+
+* Source/cmake/OptionsBlackBerry.cmake:
+
2013-05-24 Anders Carlsson
Remove PagePopup code
Modified: trunk/Source/_javascript_Core/ChangeLog (150766 => 150767)
--- trunk/Source/_javascript_Core/ChangeLog 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,3 +1,15 @@
+2013-05-27 Patrick Gansterer
+
+Use ICU_INCLUDE_DIRS in BlackBerry CMake files
+https://bugs.webkit.org/show_bug.cgi?id=116210
+
+Reviewed by Rob Buis.
+
+Set and use the ICU_INCLUDE_DIRS variable to avoid
+duplicated adding of the ICU include directory.
+
+* PlatformBlackBerry.cmake:
+
2013-05-27 Gabor Rapcsanyi
MacroAssemblerARM should use xor to swap registers instead of move
Modified: trunk/Source/_javascript_Core/PlatformBlackBerry.cmake (150766 => 150767)
--- trunk/Source/_javascript_Core/PlatformBlackBerry.cmake 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/Source/_javascript_Core/PlatformBlackBerry.cmake 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,7 +1,3 @@
-list(INSERT _javascript_Core_INCLUDE_DIRECTORIES 0
-"${BLACKBERRY_THIRD_PARTY_DIR}/icu"
-)
-
list(REMOVE_ITEM _javascript_Core_SOURCES
runtime/GCActivityCallback.cpp
)
Modified: trunk/Source/WTF/ChangeLog (150766 => 150767)
--- trunk/Source/WTF/ChangeLog 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/Source/WTF/ChangeLog 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,3 +1,15 @@
+2013-05-27 Patrick Gansterer
+
+Use ICU_INCLUDE_DIRS in BlackBerry CMake files
+https://bugs.webkit.org/show_bug.cgi?id=116210
+
+Reviewed by Rob Buis.
+
+Set and use the ICU_INCLUDE_DIRS variable to avoid
+duplicated adding of the ICU include directory.
+
+* wtf/PlatformBlackBerry.cmake:
+
2013-05-27 Ádám Kallai
[Qt] Enable parallel GC. Probably it has been fixed in r131791.
Modified: trunk/Source/WTF/wtf/PlatformBlackBerry.cmake (150766 => 150767)
--- trunk/Source/WTF/wtf/PlatformBlackBerry.cmake 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/Source/WTF/wtf/PlatformBlackBerry.cmake 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,7 +1,3 @@
list(APPEND WTF_SOURCES
blackberry/MainThreadBlackBerry.cpp
)
-
-list(INSERT WTF_INCLUDE_DIRECTORIES 0
-"${BLACKBERRY_THIRD_PARTY_DIR}/icu"
-)
Modified: trunk/Source/WebCore/ChangeLog (150766 => 150767)
--- trunk/Source/WebCore/ChangeLog 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/Source/WebCore/ChangeLog 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,3 +1,15 @@
+2013-05-27 Patrick Gansterer
+
+Use ICU_INCLUDE_DIRS in BlackBerry CMake files
+https://bugs.webkit.org/show_bug.cgi?id=116210
+
+Reviewed by Rob Buis.
+
+Set and use the ICU_INCLUDE_DIRS variable to avoid
+duplicated adding of the ICU include directory.
+
+* PlatformBlackBerry.cmake:
+
2013-05-27 Antti Koivisto
Tighten FontGlyphs::glyphDataAndPageForCharacter to take FontDescription
Modified: trunk/Source/WebCore/PlatformBlackBerry.cmake (150766 => 150767)
--- trunk/Source/WebCore/PlatformBlackBerry.cmake 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/Source/WebCore/PlatformBlackBerry.cmake 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,6 +1,5 @@
list(INSERT WebCore_INCLUDE_DIRECTORIES 0
"${BLACKBERRY_THIRD_PARTY_DIR}" # For , which is included from .
-"${BLACKBERRY_THIRD_PARTY_DIR}/icu"
)
list(REMOVE_ITEM WebCore_SOURCES
Modified: trunk
[webkit-changes] [150729] trunk/Source/WTF
Title: [150729] trunk/Source/WTF
Revision 150729
Author par...@webkit.org
Date 2013-05-26 18:25:52 -0700 (Sun, 26 May 2013)
Log Message
[WINCE] Add wtf_bsearch()
https://bugs.webkit.org/show_bug.cgi?id=116528
Reviewed by Darin Adler.
r149833 introduced usage of ::bsearch(), which does not exist on Windwos CE.
Add our own implementation of this function as wtf_bsearch and define
bsearch as wtf_bsearch to fix compilation on Windwos CE.
* wtf/StdLibExtras.h:
(wtf_bsearch):
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/StdLibExtras.h
Diff
Modified: trunk/Source/WTF/ChangeLog (150728 => 150729)
--- trunk/Source/WTF/ChangeLog 2013-05-27 00:00:25 UTC (rev 150728)
+++ trunk/Source/WTF/ChangeLog 2013-05-27 01:25:52 UTC (rev 150729)
@@ -1,3 +1,17 @@
+2013-05-26 Patrick Gansterer
+
+[WINCE] Add wtf_bsearch()
+https://bugs.webkit.org/show_bug.cgi?id=116528
+
+Reviewed by Darin Adler.
+
+r149833 introduced usage of ::bsearch(), which does not exist on Windwos CE.
+Add our own implementation of this function as wtf_bsearch and define
+bsearch as wtf_bsearch to fix compilation on Windwos CE.
+
+* wtf/StdLibExtras.h:
+(wtf_bsearch):
+
2013-05-26 Kent Tamura
Remove ENABLE_CALENDAR_PICKER
Modified: trunk/Source/WTF/wtf/StdLibExtras.h (150728 => 150729)
--- trunk/Source/WTF/wtf/StdLibExtras.h 2013-05-27 00:00:25 UTC (rev 150728)
+++ trunk/Source/WTF/wtf/StdLibExtras.h 2013-05-27 01:25:52 UTC (rev 150729)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2013 Patrick Gansterer
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -261,6 +262,31 @@
} // namespace WTF
+#if OS(WINCE)
+// Windows CE CRT has does not implement bsearch().
+inline void* wtf_bsearch(const void* key, const void* base, size_t count, size_t size, int (*compare)(const void *, const void *))
+{
+const char* first = static_cast(base);
+
+while (count) {
+size_t pos = (count - 1) >> 1;
+const char* item = first + pos * size;
+int compareResult = compare(item, key);
+if (!compareResult)
+return const_cast(item);
+if (compareResult < 0) {
+count -= (pos + 1);
+first += (pos + 1) * size;
+} else
+count = pos;
+}
+
+return 0;
+}
+
+#define bsearch(key, base, count, size, compare) wtf_bsearch(key, base, count, size, compare)
+#endif
+
// This version of placement new omits a 0 check.
enum NotNullTag { NotNull };
inline void* operator new(size_t, NotNullTag, void* location)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150603] trunk/Source/WTF
Title: [150603] trunk/Source/WTF
Revision 150603
Author par...@webkit.org
Date 2013-05-23 12:19:10 -0700 (Thu, 23 May 2013)
Log Message
Use correct stack size on Solaris and OpenBSD
https://bugs.webkit.org/show_bug.cgi?id=114978
Reviewed by Oliver Hunt.
Original patch by David Hill .
Use stack_t.ss_size for getting the size of the stack.
* wtf/Platform.h:
* wtf/StackBounds.cpp:
(WTF):
(WTF::StackBounds::initialize):
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/Platform.h
trunk/Source/WTF/wtf/StackBounds.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (150602 => 150603)
--- trunk/Source/WTF/ChangeLog 2013-05-23 18:55:53 UTC (rev 150602)
+++ trunk/Source/WTF/ChangeLog 2013-05-23 19:19:10 UTC (rev 150603)
@@ -1,3 +1,19 @@
+2013-05-23 Patrick Gansterer
+
+Use correct stack size on Solaris and OpenBSD
+https://bugs.webkit.org/show_bug.cgi?id=114978
+
+Reviewed by Oliver Hunt.
+
+Original patch by David Hill .
+
+Use stack_t.ss_size for getting the size of the stack.
+
+* wtf/Platform.h:
+* wtf/StackBounds.cpp:
+(WTF):
+(WTF::StackBounds::initialize):
+
2013-05-23 Patrick Gansterer
[WIN] Implement correct detection of stack size
Modified: trunk/Source/WTF/wtf/Platform.h (150602 => 150603)
--- trunk/Source/WTF/wtf/Platform.h 2013-05-23 18:55:53 UTC (rev 150602)
+++ trunk/Source/WTF/wtf/Platform.h 2013-05-23 19:19:10 UTC (rev 150603)
@@ -65,6 +65,11 @@
#define WTF_CPU_ALPHA 1
#endif
+/* CPU(HPPA) - HP PA-RISC */
+#if defined(__hppa__) || defined(__hppa64__)
+#define WTF_CPU_HPPA 1
+#endif
+
/* CPU(IA64) - Itanium / IA-64 */
#if defined(__ia64__)
#define WTF_CPU_IA64 1
Modified: trunk/Source/WTF/wtf/StackBounds.cpp (150602 => 150603)
--- trunk/Source/WTF/wtf/StackBounds.cpp 2013-05-23 18:55:53 UTC (rev 150602)
+++ trunk/Source/WTF/wtf/StackBounds.cpp 2013-05-23 19:19:10 UTC (rev 150603)
@@ -55,24 +55,6 @@
namespace WTF {
-// Bug 26276 - Need a mechanism to determine stack extent
-//
-// These platforms should now be working correctly:
-// DARWIN, QNX, UNIX, WINDOWS
-// These platforms are not:
-// SOLARIS, OPENBSD
-//
-// FIXME: remove this! - this code unsafely guesses at stack sizes!
-#if OS(SOLARIS) || OS(OPENBSD)
-// Based on the current limit used by the JSC parser, guess the stack size.
-static const ptrdiff_t estimatedStackSize = 128 * sizeof(void*) * 1024;
-// This method assumes the stack is growing downwards.
-static void* estimateStackBound(void* origin)
-{
-return static_cast(origin) - estimatedStackSize;
-}
-#endif
-
#if OS(DARWIN)
void StackBounds::initialize()
@@ -124,7 +106,7 @@
stack_t s;
thr_stksegment(&s);
m_origin = s.ss_sp;
-m_bound = estimateStackBound(m_origin);
+m_bound = static_cast(m_origin) - s.ss_size;
}
#elif OS(OPENBSD)
@@ -135,7 +117,11 @@
stack_t stack;
pthread_stackseg_np(thread, &stack);
m_origin = stack.ss_sp;
-m_bound = estimateStackBound(m_origin);
+#if CPU(HPPA)
+m_bound = static_cast(m_origin) + stack.ss_size;
+#else
+m_bound = static_cast(m_origin) - stack.ss_size;
+#endif
}
#elif OS(UNIX)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150600] trunk/Source/WTF
Title: [150600] trunk/Source/WTF
Revision 150600
Author par...@webkit.org
Date 2013-05-23 11:51:00 -0700 (Thu, 23 May 2013)
Log Message
[WIN] Implement correct detection of stack size
https://bugs.webkit.org/show_bug.cgi?id=116661
Reviewed by Oliver Hunt.
* wtf/StackBounds.cpp:
(WTF):
(WTF::StackBounds::initialize):
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/StackBounds.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (150599 => 150600)
--- trunk/Source/WTF/ChangeLog 2013-05-23 18:49:57 UTC (rev 150599)
+++ trunk/Source/WTF/ChangeLog 2013-05-23 18:51:00 UTC (rev 150600)
@@ -1,3 +1,14 @@
+2013-05-23 Patrick Gansterer
+
+[WIN] Implement correct detection of stack size
+https://bugs.webkit.org/show_bug.cgi?id=116661
+
+Reviewed by Oliver Hunt.
+
+* wtf/StackBounds.cpp:
+(WTF):
+(WTF::StackBounds::initialize):
+
2013-05-22 Dean Jackson
Rolling out r150555. It borked about 30 media tests.
Modified: trunk/Source/WTF/wtf/StackBounds.cpp (150599 => 150600)
--- trunk/Source/WTF/wtf/StackBounds.cpp 2013-05-23 18:49:57 UTC (rev 150599)
+++ trunk/Source/WTF/wtf/StackBounds.cpp 2013-05-23 18:51:00 UTC (rev 150600)
@@ -58,12 +58,12 @@
// Bug 26276 - Need a mechanism to determine stack extent
//
// These platforms should now be working correctly:
-// DARWIN, QNX, UNIX
+// DARWIN, QNX, UNIX, WINDOWS
// These platforms are not:
-// WINDOWS, SOLARIS, OPENBSD, WINCE
+// SOLARIS, OPENBSD
//
// FIXME: remove this! - this code unsafely guesses at stack sizes!
-#if OS(WINDOWS) || OS(SOLARIS) || OS(OPENBSD)
+#if OS(SOLARIS) || OS(OPENBSD)
// Based on the current limit used by the JSC parser, guess the stack size.
static const ptrdiff_t estimatedStackSize = 128 * sizeof(void*) * 1024;
// This method assumes the stack is growing downwards.
@@ -163,105 +163,46 @@
m_origin = static_cast(stackBase) + stackSize;
}
-#elif OS(WINCE)
+#elif OS(WINDOWS)
-static bool detectGrowingDownward(void* previousFrame)
-{
-// Find the address of this stack frame by taking the address of a local variable.
-int thisFrame;
-return previousFrame > &thisFrame;
-}
-
-static inline bool isPageWritable(void* page)
-{
-MEMORY_BASIC_INFORMATION memoryInformation;
-DWORD result = VirtualQuery(page, &memoryInformation, sizeof(memoryInformation));
-
-// return false on error, including ptr outside memory
-if (result != sizeof(memoryInformation))
-return false;
-
-DWORD protect = memoryInformation.Protect & ~(PAGE_GUARD | PAGE_NOCACHE);
-return protect == PAGE_READWRITE
-|| protect == PAGE_WRITECOPY
-|| protect == PAGE_EXECUTE_READWRITE
-|| protect == PAGE_EXECUTE_WRITECOPY;
-}
-
-static inline void* getLowerStackBound(char* currentPage, DWORD pageSize)
-{
-while (currentPage > 0) {
-// check for underflow
-if (currentPage >= reinterpret_cast(pageSize))
-currentPage -= pageSize;
-else
-currentPage = 0;
-
-if (!isPageWritable(currentPage))
-return currentPage + pageSize;
-}
-
-return 0;
-}
-
-static inline void* getUpperStackBound(char* currentPage, DWORD pageSize)
-{
-do {
-// guaranteed to complete because isPageWritable returns false at end of memory
-currentPage += pageSize;
-} while (isPageWritable(currentPage));
-
-return currentPage - pageSize;
-}
-
void StackBounds::initialize()
{
-// find the address of this stack frame by taking the address of a local variable
-void* thisFrame = &thisFrame;
-bool isGrowingDownward = detectGrowingDownward(thisFrame);
-
SYSTEM_INFO systemInfo;
GetSystemInfo(&systemInfo);
DWORD pageSize = systemInfo.dwPageSize;
-// scan all of memory starting from this frame, and return the last writeable page found
-char* currentPage = reinterpret_cast(reinterpret_cast(thisFrame) & ~(pageSize - 1));
-void* lowerStackBound = getLowerStackBound(currentPage, pageSize);
-void* upperStackBound = getUpperStackBound(currentPage, pageSize);
+MEMORY_BASIC_INFORMATION stackOrigin;
+VirtualQuery(&stackOrigin, &stackOrigin, sizeof(stackOrigin));
+// stackOrigin.AllocationBase points to the reserved stack memory base address.
-m_origin = isGrowingDownward ? upperStackBound : lowerStackBound;
-m_bound = isGrowingDownward ? lowerStackBound : upperStackBound;
-}
+m_origin = static_cast(stackOrigin.BaseAddress) + stackOrigin.RegionSize;
+#if OS(WINCE)
+MEMORY_BASIC_INFORMATION stackMemory;
+VirtualQuery(m_origin, &stackMemory, sizeof(stackMemory));
-#elif OS(WINDOWS)
-
-void StackBounds::initialize()
-{
-#if CPU(X86) && COMPILER(MSVC)
-// offset 0x18 from the FS segment register gives a pointer to
-// the thread information block for the current thread
-NT_TIB* pTib;
-__asm {
-MOV EAX, FS:[18h]
-MOV pTib, EAX
-}
-m_origin = s
[webkit-changes] [150592] trunk/Tools
Title: [150592] trunk/Tools Revision 150592 Author par...@webkit.org Date 2013-05-23 10:49:45 -0700 (Thu, 23 May 2013) Log Message Make default bug links in buildbot clickable https://bugs.webkit.org/show_bug.cgi?id=116673 Reviewed by Ryosuke Niwa. Use changecommentlink of html.WebStatus to make the links clickable. * BuildSlaveSupport/build.webkit.org-config/master.cfg: Modified Paths trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg trunk/Tools/ChangeLog Diff Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (150591 => 150592) --- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2013-05-23 17:17:19 UTC (rev 150591) +++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2013-05-23 17:49:45 UTC (rev 150592) @@ -44,6 +44,7 @@ c['status'] = [] c['status'].append(html.WebStatus(http_port=8710, revlink="http://trac.webkit.org/changeset/%s", + changecommentlink=(r"(https://bugs\.webkit\.org/show_bug\.cgi\?id=|webkit\.org/b/)(\d+)", "https://bugs.webkit.org/show_bug.cgi?id=\2"), authz=authz)) c['slavePortnum'] = 17000 Modified: trunk/Tools/ChangeLog (150591 => 150592) --- trunk/Tools/ChangeLog 2013-05-23 17:17:19 UTC (rev 150591) +++ trunk/Tools/ChangeLog 2013-05-23 17:49:45 UTC (rev 150592) @@ -1,3 +1,14 @@ +2013-05-23 Patrick Gansterer + +Make default bug links in buildbot clickable +https://bugs.webkit.org/show_bug.cgi?id=116673 + +Reviewed by Ryosuke Niwa. + +Use changecommentlink of html.WebStatus to make the links clickable. + +* BuildSlaveSupport/build.webkit.org-config/master.cfg: + 2013-05-22 Ryosuke Niwa REGRESSION(r150491): WebKit2.DOMWindowExtensionNoCache fails ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150591] trunk/Websites/bugs.webkit.org
Title: [150591] trunk/Websites/bugs.webkit.org Revision 150591 Author par...@webkit.org Date 2013-05-23 10:17:19 -0700 (Thu, 23 May 2013) Log Message EWS bubbles need more space https://bugs.webkit.org/show_bug.cgi?id=116675 Reviewed by Andreas Kling. * template/en/custom/attachment/list.html.tmpl: Modified Paths trunk/Websites/bugs.webkit.org/ChangeLog trunk/Websites/bugs.webkit.org/template/en/custom/attachment/list.html.tmpl Diff Modified: trunk/Websites/bugs.webkit.org/ChangeLog (150590 => 150591) --- trunk/Websites/bugs.webkit.org/ChangeLog 2013-05-23 16:45:10 UTC (rev 150590) +++ trunk/Websites/bugs.webkit.org/ChangeLog 2013-05-23 17:17:19 UTC (rev 150591) @@ -1,3 +1,12 @@ +2013-05-23 Patrick Gansterer + +EWS bubbles need more space +https://bugs.webkit.org/show_bug.cgi?id=116675 + +Reviewed by Andreas Kling. + +* template/en/custom/attachment/list.html.tmpl: + 2013-04-16 Ryosuke Niwa Build fix after r148527. Modified: trunk/Websites/bugs.webkit.org/template/en/custom/attachment/list.html.tmpl (150590 => 150591) --- trunk/Websites/bugs.webkit.org/template/en/custom/attachment/list.html.tmpl 2013-05-23 16:45:10 UTC (rev 150590) +++ trunk/Websites/bugs.webkit.org/template/en/custom/attachment/list.html.tmpl 2013-05-23 17:17:19 UTC (rev 150591) @@ -156,7 +156,7 @@ [% END %] -style="width: 400px; height: 20px; border: none;" scrolling="no"> +style="width: 600px; height: 20px; border: none;" scrolling="no"> [% END %] ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150433] trunk/Source/WebCore
Title: [150433] trunk/Source/WebCore Revision 150433 Author par...@webkit.org Date 2013-05-21 02:31:49 -0700 (Tue, 21 May 2013) Log Message Build fix for !USE(ACCELERATED_COMPOSITING) after r150307. * rendering/RenderLayerCompositor.h: Added missing #if USE(ACCELERATED_COMPOSITING). Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/rendering/RenderLayerCompositor.h Diff Modified: trunk/Source/WebCore/ChangeLog (150432 => 150433) --- trunk/Source/WebCore/ChangeLog 2013-05-21 09:04:46 UTC (rev 150432) +++ trunk/Source/WebCore/ChangeLog 2013-05-21 09:31:49 UTC (rev 150433) @@ -1,3 +1,9 @@ +2013-05-21 Patrick Gansterer + +Build fix for !USE(ACCELERATED_COMPOSITING) after r150307. + +* rendering/RenderLayerCompositor.h: Added missing #if USE(ACCELERATED_COMPOSITING). + 2013-05-20 Antti Koivisto Simplify Shadow DOM distribution code Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (150432 => 150433) --- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2013-05-21 09:04:46 UTC (rev 150432) +++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2013-05-21 09:31:49 UTC (rev 150433) @@ -26,6 +26,8 @@ #ifndef RenderLayerCompositor_h #define RenderLayerCompositor_h +#if USE(ACCELERATED_COMPOSITING) + #include "ChromeClient.h" #include "Frame.h" #include "GraphicsLayerClient.h" @@ -471,4 +473,6 @@ } // namespace WebCore +#endif // USE(ACCELERATED_COMPOSITING) + #endif // RenderLayerCompositor_h ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150253] trunk/Source
Title: [150253] trunk/Source
Revision 150253
Author par...@webkit.org
Date 2013-05-17 06:00:39 -0700 (Fri, 17 May 2013)
Log Message
[CMake] Remove invalid include paths
https://bugs.webkit.org/show_bug.cgi?id=116213
Reviewed by Gyuyoung Kim.
Since "${_javascript_CORE_DIR}/wtf" does not exist, it is safe
to remove them from the list of include directories.
Source/_javascript_Core:
* PlatformEfl.cmake: Removed.
* PlatformGTK.cmake: Removed.
Source/WTF:
* wtf/PlatformEfl.cmake:
* wtf/PlatformGTK.cmake:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/PlatformEfl.cmake
trunk/Source/WTF/wtf/PlatformGTK.cmake
Removed Paths
trunk/Source/_javascript_Core/PlatformEfl.cmake
trunk/Source/_javascript_Core/PlatformGTK.cmake
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (150252 => 150253)
--- trunk/Source/_javascript_Core/ChangeLog 2013-05-17 12:41:28 UTC (rev 150252)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-05-17 13:00:39 UTC (rev 150253)
@@ -1,3 +1,16 @@
+2013-05-17 Patrick Gansterer
+
+[CMake] Remove invalid include paths
+https://bugs.webkit.org/show_bug.cgi?id=116213
+
+Reviewed by Gyuyoung Kim.
+
+Since "${_javascript_CORE_DIR}/wtf" does not exist, it is safe
+to remove them from the list of include directories.
+
+* PlatformEfl.cmake: Removed.
+* PlatformGTK.cmake: Removed.
+
2013-05-16 Patrick Gansterer
Consolidate lists in _javascript_Core CMake files
Deleted: trunk/Source/_javascript_Core/PlatformEfl.cmake (150252 => 150253)
--- trunk/Source/_javascript_Core/PlatformEfl.cmake 2013-05-17 12:41:28 UTC (rev 150252)
+++ trunk/Source/_javascript_Core/PlatformEfl.cmake 2013-05-17 13:00:39 UTC (rev 150253)
@@ -1,3 +0,0 @@
-list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
-${_javascript_CORE_DIR}/wtf/gobject
-)
Deleted: trunk/Source/_javascript_Core/PlatformGTK.cmake (150252 => 150253)
--- trunk/Source/_javascript_Core/PlatformGTK.cmake 2013-05-17 12:41:28 UTC (rev 150252)
+++ trunk/Source/_javascript_Core/PlatformGTK.cmake 2013-05-17 13:00:39 UTC (rev 150253)
@@ -1,3 +0,0 @@
-list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
-${_javascript_CORE_DIR}/wtf/gobject
-)
Modified: trunk/Source/WTF/ChangeLog (150252 => 150253)
--- trunk/Source/WTF/ChangeLog 2013-05-17 12:41:28 UTC (rev 150252)
+++ trunk/Source/WTF/ChangeLog 2013-05-17 13:00:39 UTC (rev 150253)
@@ -1,3 +1,16 @@
+2013-05-17 Patrick Gansterer
+
+[CMake] Remove invalid include paths
+https://bugs.webkit.org/show_bug.cgi?id=116213
+
+Reviewed by Gyuyoung Kim.
+
+Since "${_javascript_CORE_DIR}/wtf" does not exist, it is safe
+to remove them from the list of include directories.
+
+* wtf/PlatformEfl.cmake:
+* wtf/PlatformGTK.cmake:
+
2013-05-16 Benjamin Poulain
Add the symbol WTFInvokeCrashHook back for binary compatibility.
Modified: trunk/Source/WTF/wtf/PlatformEfl.cmake (150252 => 150253)
--- trunk/Source/WTF/wtf/PlatformEfl.cmake 2013-05-17 12:41:28 UTC (rev 150252)
+++ trunk/Source/WTF/wtf/PlatformEfl.cmake 2013-05-17 13:00:39 UTC (rev 150253)
@@ -28,7 +28,4 @@
${EO_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
-${_javascript_CORE_DIR}/wtf/gobject
-${_javascript_CORE_DIR}/wtf/unicode
-${_javascript_CORE_DIR}/wtf/efl
)
Modified: trunk/Source/WTF/wtf/PlatformGTK.cmake (150252 => 150253)
--- trunk/Source/WTF/wtf/PlatformGTK.cmake 2013-05-17 12:41:28 UTC (rev 150252)
+++ trunk/Source/WTF/wtf/PlatformGTK.cmake 2013-05-17 13:00:39 UTC (rev 150253)
@@ -15,6 +15,4 @@
list(APPEND WTF_INCLUDE_DIRECTORIES
${GLIB_INCLUDE_DIRS}
-${_javascript_CORE_DIR}/wtf/gobject
-${_javascript_CORE_DIR}/wtf/unicode
)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150231] trunk/Source/WebCore
Title: [150231] trunk/Source/WebCore
Revision 150231
Author par...@webkit.org
Date 2013-05-16 19:47:20 -0700 (Thu, 16 May 2013)
Log Message
Port functions for pathhandling to Windows CE in FileSystemWin
https://bugs.webkit.org/show_bug.cgi?id=116208
Reviewed by Darin Adler.
This will allow us to remove FileSystemWinCE in a next step.
* platform/win/FileSystemWin.cpp:
(WebCore::pathByAppendingComponent):
(WebCore::pathGetFileName):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/win/FileSystemWin.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (150230 => 150231)
--- trunk/Source/WebCore/ChangeLog 2013-05-17 02:46:25 UTC (rev 150230)
+++ trunk/Source/WebCore/ChangeLog 2013-05-17 02:47:20 UTC (rev 150231)
@@ -1,3 +1,16 @@
+2013-05-16 Patrick Gansterer
+
+Port functions for pathhandling to Windows CE in FileSystemWin
+https://bugs.webkit.org/show_bug.cgi?id=116208
+
+Reviewed by Darin Adler.
+
+This will allow us to remove FileSystemWinCE in a next step.
+
+* platform/win/FileSystemWin.cpp:
+(WebCore::pathByAppendingComponent):
+(WebCore::pathGetFileName):
+
2013-05-16 Tim Horton
PDFPlugins don't load when plugins are disabled, but they should
Modified: trunk/Source/WebCore/platform/win/FileSystemWin.cpp (150230 => 150231)
--- trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2013-05-17 02:46:25 UTC (rev 150230)
+++ trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2013-05-17 02:47:20 UTC (rev 150231)
@@ -137,6 +137,16 @@
{
Vector buffer(MAX_PATH);
+#if OS(WINCE)
+buffer.append(path.characters(), path.length());
+
+UChar lastPathCharacter = path[path.length() - 1];
+if (lastPathCharacter != L'\\' && lastPathCharacter != L'/' && component[0] != L'\\' && component[0] != L'/')
+buffer.append(PlatformFilePathSeparator);
+
+buffer.append(component.characters(), component.length());
+buffer.shrinkToFit();
+#else
if (path.length() + 1 > buffer.size())
return String();
@@ -148,6 +158,7 @@
return String();
buffer.resize(wcslen(buffer.data()));
+#endif
return String::adopt(buffer);
}
@@ -190,7 +201,24 @@
String pathGetFileName(const String& path)
{
+#if OS(WINCE)
+size_t positionSlash = path.reverseFind('/');
+size_t positionBackslash = path.reverseFind('\\');
+
+size_t position;
+if (positionSlash == notFound)
+position = positionBackslash;
+else if (positionBackslash == notFound)
+position = positionSlash;
+else
+position = std::max(positionSlash, positionBackslash);
+
+if (position == notFound)
+return path;
+return path.substring(position + 1);
+#else
return String(::PathFindFileName(String(path).charactersWithNullTermination()));
+#endif
}
String directoryName(const String& path)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150222] trunk/Source/WebCore
Title: [150222] trunk/Source/WebCore
Revision 150222
Author par...@webkit.org
Date 2013-05-16 17:19:34 -0700 (Thu, 16 May 2013)
Log Message
Remove unused function safeCreateFile() from WebCore
https://bugs.webkit.org/show_bug.cgi?id=116211
Reviewed by Anders Carlsson.
* platform/FileSystem.h:
* platform/win/FileSystemWin.cpp:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/FileSystem.h
trunk/Source/WebCore/platform/win/FileSystemWin.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (150221 => 150222)
--- trunk/Source/WebCore/ChangeLog 2013-05-17 00:17:46 UTC (rev 150221)
+++ trunk/Source/WebCore/ChangeLog 2013-05-17 00:19:34 UTC (rev 150222)
@@ -1,3 +1,13 @@
+2013-05-16 Patrick Gansterer
+
+Remove unused function safeCreateFile() from WebCore
+https://bugs.webkit.org/show_bug.cgi?id=116211
+
+Reviewed by Anders Carlsson.
+
+* platform/FileSystem.h:
+* platform/win/FileSystemWin.cpp:
+
2013-05-16 Peter Gal
[curl] MIME type should be in lowercase
Modified: trunk/Source/WebCore/platform/FileSystem.h (150221 => 150222)
--- trunk/Source/WebCore/platform/FileSystem.h 2013-05-17 00:17:46 UTC (rev 150221)
+++ trunk/Source/WebCore/platform/FileSystem.h 2013-05-17 00:19:34 UTC (rev 150222)
@@ -227,10 +227,6 @@
String roamingUserSpecificStorageDirectory();
#endif
-#if PLATFORM(WIN) && USE(CF)
-bool safeCreateFile(const String&, CFDataRef);
-#endif
-
} // namespace WebCore
#endif // FileSystem_h
Modified: trunk/Source/WebCore/platform/win/FileSystemWin.cpp (150221 => 150222)
--- trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2013-05-17 00:17:46 UTC (rev 150221)
+++ trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2013-05-17 00:19:34 UTC (rev 150222)
@@ -367,40 +367,6 @@
return cachedStorageDirectory(CSIDL_APPDATA);
}
-#if USE(CF)
-
-bool safeCreateFile(const String& path, CFDataRef data)
-{
-// Create a temporary file.
-WCHAR tempDirPath[MAX_PATH];
-if (!GetTempPathW(WTF_ARRAY_LENGTH(tempDirPath), tempDirPath))
-return false;
-
-WCHAR tempPath[MAX_PATH];
-if (!GetTempFileNameW(tempDirPath, L"WEBKIT", 0, tempPath))
-return false;
-
-HANDLE tempFileHandle = CreateFileW(tempPath, GENERIC_READ | GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
-if (tempFileHandle == INVALID_HANDLE_VALUE)
-return false;
-
-// Write the data to this temp file.
-DWORD written;
-if (!WriteFile(tempFileHandle, CFDataGetBytePtr(data), static_cast(CFDataGetLength(data)), &written, 0))
-return false;
-
-CloseHandle(tempFileHandle);
-
-// Copy the temp file to the destination file.
-String destination = path;
-if (!MoveFileExW(tempPath, destination.charactersWithNullTermination(), MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED))
-return false;
-
-return true;
-}
-
-#endif // USE(CF)
-
Vector listDirectory(const String& directory, const String& filter)
{
Vector entries;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150220] trunk/Source/JavaScriptCore
Title: [150220] trunk/Source/_javascript_Core
Revision 150220
Author par...@webkit.org
Date 2013-05-16 17:14:52 -0700 (Thu, 16 May 2013)
Log Message
Consolidate lists in _javascript_Core CMake files
https://bugs.webkit.org/show_bug.cgi?id=115992
Reviewed by Gyuyoung Kim.
Move common files into the CMakeLists.txt to avoid duplicating the list of files.
Also rebase the recently added GTK files to match the other CMake ports, since
the submitted patch was based on an older version of the source tree.
* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* shell/CMakeLists.txt:
* shell/PlatformEfl.cmake:
* shell/PlatformGTK.cmake:
Modified Paths
trunk/Source/_javascript_Core/CMakeLists.txt
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/PlatformEfl.cmake
trunk/Source/_javascript_Core/PlatformGTK.cmake
trunk/Source/_javascript_Core/shell/CMakeLists.txt
trunk/Source/_javascript_Core/shell/PlatformEfl.cmake
trunk/Source/_javascript_Core/shell/PlatformGTK.cmake
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (150219 => 150220)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2013-05-17 00:14:41 UTC (rev 150219)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2013-05-17 00:14:52 UTC (rev 150220)
@@ -164,6 +164,7 @@
jit/ClosureCallStubRoutine.cpp
jit/ExecutableAllocator.cpp
+jit/ExecutableAllocatorFixedVMPool.cpp
jit/HostCallReturnValue.cpp
jit/GCAwareJITStubRoutine.cpp
jit/JITArithmetic32_64.cpp
Modified: trunk/Source/_javascript_Core/ChangeLog (150219 => 150220)
--- trunk/Source/_javascript_Core/ChangeLog 2013-05-17 00:14:41 UTC (rev 150219)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-05-17 00:14:52 UTC (rev 150220)
@@ -1,3 +1,21 @@
+2013-05-16 Patrick Gansterer
+
+Consolidate lists in _javascript_Core CMake files
+https://bugs.webkit.org/show_bug.cgi?id=115992
+
+Reviewed by Gyuyoung Kim.
+
+Move common files into the CMakeLists.txt to avoid duplicating the list of files.
+Also rebase the recently added GTK files to match the other CMake ports, since
+the submitted patch was based on an older version of the source tree.
+
+* CMakeLists.txt:
+* PlatformEfl.cmake:
+* PlatformGTK.cmake:
+* shell/CMakeLists.txt:
+* shell/PlatformEfl.cmake:
+* shell/PlatformGTK.cmake:
+
2013-05-16 Geoffrey Garen
JSValue shouldn't protect/unprotect its context
Modified: trunk/Source/_javascript_Core/PlatformEfl.cmake (150219 => 150220)
--- trunk/Source/_javascript_Core/PlatformEfl.cmake 2013-05-17 00:14:41 UTC (rev 150219)
+++ trunk/Source/_javascript_Core/PlatformEfl.cmake 2013-05-17 00:14:52 UTC (rev 150220)
@@ -1,8 +1,3 @@
-list(APPEND _javascript_Core_SOURCES
-jit/ExecutableAllocatorFixedVMPool.cpp
-)
-
list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
${_javascript_CORE_DIR}/wtf/gobject
)
-
Modified: trunk/Source/_javascript_Core/PlatformGTK.cmake (150219 => 150220)
--- trunk/Source/_javascript_Core/PlatformGTK.cmake 2013-05-17 00:14:41 UTC (rev 150219)
+++ trunk/Source/_javascript_Core/PlatformGTK.cmake 2013-05-17 00:14:52 UTC (rev 150220)
@@ -1,13 +1,3 @@
-list(APPEND _javascript_Core_SOURCES
-jit/ExecutableAllocatorFixedVMPool.cpp
-)
-
-list(APPEND _javascript_Core_LIBRARIES
-${ICU_I18N_LIBRARIES}
-)
-
list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
${_javascript_CORE_DIR}/wtf/gobject
-${ICU_INCLUDE_DIRS}
)
-
Modified: trunk/Source/_javascript_Core/shell/CMakeLists.txt (150219 => 150220)
--- trunk/Source/_javascript_Core/shell/CMakeLists.txt 2013-05-17 00:14:41 UTC (rev 150219)
+++ trunk/Source/_javascript_Core/shell/CMakeLists.txt 2013-05-17 00:14:52 UTC (rev 150220)
@@ -5,6 +5,7 @@
set(JSC_LIBRARIES
${WTF_LIBRARY_NAME}
${_javascript_Core_LIBRARY_NAME}
+${CMAKE_DL_LIBS}
)
if ("${_javascript_Core_LIBRARY_TYPE}" MATCHES "STATIC")
Modified: trunk/Source/_javascript_Core/shell/PlatformEfl.cmake (150219 => 150220)
--- trunk/Source/_javascript_Core/shell/PlatformEfl.cmake 2013-05-17 00:14:41 UTC (rev 150219)
+++ trunk/Source/_javascript_Core/shell/PlatformEfl.cmake 2013-05-17 00:14:52 UTC (rev 150220)
@@ -1,5 +1,4 @@
list(APPEND JSC_LIBRARIES
${GLIB_LIBRARIES}
${ECORE_LIBRARIES}
-${CMAKE_DL_LIBS}
)
Modified: trunk/Source/_javascript_Core/shell/PlatformGTK.cmake (150219 => 150220)
--- trunk/Source/_javascript_Core/shell/PlatformGTK.cmake 2013-05-17 00:14:41 UTC (rev 150219)
+++ trunk/Source/_javascript_Core/shell/PlatformGTK.cmake 2013-05-17 00:14:52 UTC (rev 150220)
@@ -1,5 +1,3 @@
list(APPEND JSC_LIBRARIES
${GLIB_LIBRARIES}
-${CMAKE_DL_LIBS}
)
-
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150123] trunk
Title: [150123] trunk
Revision 150123
Author par...@webkit.org
Date 2013-05-15 09:48:32 -0700 (Wed, 15 May 2013)
Log Message
Consolidate lists in WTF CMake files
https://bugs.webkit.org/show_bug.cgi?id=116142
Reviewed by Martin Robinson.
Move common files into the CMakeLists.txt to avoid duplicating the list of files.
Also rebase the recently added GTK files to match the other CMake ports, since
the submitted patch was based on an older version of the source tree.
.:
* Source/cmake/OptionsGTK.cmake:
Source/WTF:
* wtf/CMakeLists.txt:
* wtf/PlatformBlackBerry.cmake:
* wtf/PlatformEfl.cmake:
* wtf/PlatformGTK.cmake:
* wtf/PlatformWinCE.cmake:
Modified Paths
trunk/ChangeLog
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/CMakeLists.txt
trunk/Source/WTF/wtf/PlatformBlackBerry.cmake
trunk/Source/WTF/wtf/PlatformEfl.cmake
trunk/Source/WTF/wtf/PlatformGTK.cmake
trunk/Source/WTF/wtf/PlatformWinCE.cmake
trunk/Source/cmake/OptionsGTK.cmake
Diff
Modified: trunk/ChangeLog (150122 => 150123)
--- trunk/ChangeLog 2013-05-15 16:44:20 UTC (rev 150122)
+++ trunk/ChangeLog 2013-05-15 16:48:32 UTC (rev 150123)
@@ -1,3 +1,16 @@
+2013-05-15 Patrick Gansterer
+
+Consolidate lists in WTF CMake files
+https://bugs.webkit.org/show_bug.cgi?id=116142
+
+Reviewed by Martin Robinson.
+
+Move common files into the CMakeLists.txt to avoid duplicating the list of files.
+Also rebase the recently added GTK files to match the other CMake ports, since
+the submitted patch was based on an older version of the source tree.
+
+* Source/cmake/OptionsGTK.cmake:
+
2013-05-14 Zan Dobersek
[GTK] Move generated ColorData.cpp, WebKitFontFamilyNames.(cpp|h) build targets into libPlatform
Modified: trunk/Source/WTF/ChangeLog (150122 => 150123)
--- trunk/Source/WTF/ChangeLog 2013-05-15 16:44:20 UTC (rev 150122)
+++ trunk/Source/WTF/ChangeLog 2013-05-15 16:48:32 UTC (rev 150123)
@@ -1,3 +1,20 @@
+2013-05-15 Patrick Gansterer
+
+Consolidate lists in WTF CMake files
+https://bugs.webkit.org/show_bug.cgi?id=116142
+
+Reviewed by Martin Robinson.
+
+Move common files into the CMakeLists.txt to avoid duplicating the list of files.
+Also rebase the recently added GTK files to match the other CMake ports, since
+the submitted patch was based on an older version of the source tree.
+
+* wtf/CMakeLists.txt:
+* wtf/PlatformBlackBerry.cmake:
+* wtf/PlatformEfl.cmake:
+* wtf/PlatformGTK.cmake:
+* wtf/PlatformWinCE.cmake:
+
2013-05-14 Carlos Garcia Campos
Remove WTF_USE_PLATFORM_STRATEGIES
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (150122 => 150123)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2013-05-15 16:44:20 UTC (rev 150122)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2013-05-15 16:48:32 UTC (rev 150123)
@@ -214,6 +214,10 @@
"${CMAKE_BINARY_DIR}"
)
+set(APPEND WTF_LIBRARIES
+${CMAKE_DL_LIBS}
+)
+
if (WTF_USE_ICU_UNICODE)
list(APPEND WTF_HEADERS
unicode/icu/UnicodeIcu.h
@@ -238,6 +242,25 @@
)
endif ()
+if (WIN32)
+list(APPEND WTF_SOURCES
+OSAllocatorWin.cpp
+ThreadSpecificWin.cpp
+ThreadingWin.cpp
+
+win/OwnPtrWin.cpp
+)
+else ()
+list(APPEND WTF_HEADERS
+ThreadIdentifierDataPthreads.h
+)
+list(APPEND WTF_SOURCES
+OSAllocatorPosix.cpp
+ThreadIdentifierDataPthreads.cpp
+ThreadingPthreads.cpp
+)
+endif ()
+
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
Modified: trunk/Source/WTF/wtf/PlatformBlackBerry.cmake (150122 => 150123)
--- trunk/Source/WTF/wtf/PlatformBlackBerry.cmake 2013-05-15 16:44:20 UTC (rev 150122)
+++ trunk/Source/WTF/wtf/PlatformBlackBerry.cmake 2013-05-15 16:48:32 UTC (rev 150123)
@@ -1,8 +1,4 @@
list(APPEND WTF_SOURCES
-OSAllocatorPosix.cpp
-TCSystemAlloc.cpp
-ThreadIdentifierDataPthreads.cpp
-ThreadingPthreads.cpp
blackberry/MainThreadBlackBerry.cpp
)
Modified: trunk/Source/WTF/wtf/PlatformEfl.cmake (150122 => 150123)
--- trunk/Source/WTF/wtf/PlatformEfl.cmake 2013-05-15 16:44:20 UTC (rev 150122)
+++ trunk/Source/WTF/wtf/PlatformEfl.cmake 2013-05-15 16:48:32 UTC (rev 150123)
@@ -2,12 +2,9 @@
efl/MainThreadEfl.cpp
efl/OwnPtrEfl.cpp
efl/RefPtrEfl.cpp
+
gobject/GOwnPtr.cpp
gobject/GRefPtr.cpp
-
-OSAllocatorPosix.cpp
-ThreadIdentifierDataPthreads.cpp
-ThreadingPthreads.cpp
)
list(APPEND WTF_LIBRARIES
@@ -21,7 +18,6 @@
${EINA_LIBRARIES}
${EO_LIBRARIES}
${EVAS_LIBRARIES}
-${CMAKE_DL_LIBS}
)
list(APPEND WTF_INCLUDE_DIRECTORIES
Modified: trunk/Source/WTF/wtf/PlatformGTK.cmake (150122 => 150123)
--- trunk/Source/WTF/wtf/PlatformGTK.cmake 2013-05-15 16:44:20 UTC (rev 150122)
+++ trunk/Source/WTF/wtf/PlatformGTK.cmake 2013-05-15 16:48:32 UTC (rev 150123)
@@ -1,19 +1,9 @@
list(APPEND WTF_SOURCES
-OSAll
[webkit-changes] [150115] trunk/Source/WebKit/win
Title: [150115] trunk/Source/WebKit/win Revision 150115 Author par...@webkit.org Date 2013-05-15 09:03:13 -0700 (Wed, 15 May 2013) Log Message Remove unnecessary dependecy on CoreFoundation from WebDatabaseManager https://bugs.webkit.org/show_bug.cgi?id=115993 Reviewed by Anders Carlsson. Using COMPropertyBag instead of CFDictionaryPropertyBag also reduces the total lines of code needed for the same functionality. * WebDatabaseManager.cpp: (WebDatabaseManager::dispatchDidModifyDatabase): Modified Paths trunk/Source/WebKit/win/ChangeLog trunk/Source/WebKit/win/WebDatabaseManager.cpp Diff Modified: trunk/Source/WebKit/win/ChangeLog (150114 => 150115) --- trunk/Source/WebKit/win/ChangeLog 2013-05-15 15:51:27 UTC (rev 150114) +++ trunk/Source/WebKit/win/ChangeLog 2013-05-15 16:03:13 UTC (rev 150115) @@ -1,3 +1,16 @@ +2013-05-15 Patrick Gansterer + +Remove unnecessary dependecy on CoreFoundation from WebDatabaseManager +https://bugs.webkit.org/show_bug.cgi?id=115993 + +Reviewed by Anders Carlsson. + +Using COMPropertyBag instead of CFDictionaryPropertyBag also reduces +the total lines of code needed for the same functionality. + +* WebDatabaseManager.cpp: +(WebDatabaseManager::dispatchDidModifyDatabase): + 2013-05-12 Timothy Hatcher Add support for updating the Web Inspector toolbar height. Modified: trunk/Source/WebKit/win/WebDatabaseManager.cpp (150114 => 150115) --- trunk/Source/WebKit/win/WebDatabaseManager.cpp 2013-05-15 15:51:27 UTC (rev 150114) +++ trunk/Source/WebKit/win/WebDatabaseManager.cpp 2013-05-15 16:03:13 UTC (rev 150115) @@ -32,8 +32,8 @@ #if ENABLE(SQL_DATABASE) -#include "CFDictionaryPropertyBag.h" #include "COMEnumVariant.h" +#include "COMPropertyBag.h" #include "MarshallingHelpers.h" #include "WebNotificationCenter.h" #include "WebSecurityOrigin.h" @@ -398,14 +398,10 @@ COMPtr securityOrigin(AdoptCOM, WebSecurityOrigin::createInstance(origin)); -RetainPtr userInfo = adoptCF(CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks)); +HashMap userInfo; +userInfo.set(WebDatabaseNameKey, databaseName); +COMPtr userInfoBag(AdoptCOM, COMPropertyBag::adopt(userInfo)); -static CFStringRef databaseNameKey = MarshallingHelpers::LPCOLESTRToCFStringRef(WebDatabaseNameKey); -CFDictionarySetValue(userInfo.get(), databaseNameKey, databaseName.createCFString().get()); - -COMPtr userInfoBag = CFDictionaryPropertyBag::createInstance(); -userInfoBag->setDictionary(userInfo.get()); - notifyCenter->postNotificationName(databaseDidModifyOriginName, securityOrigin.get(), userInfoBag.get()); } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [150106] trunk/Source/WebCore
Title: [150106] trunk/Source/WebCore
Revision 150106
Author par...@webkit.org
Date 2013-05-15 02:03:56 -0700 (Wed, 15 May 2013)
Log Message
[WINCE] Fix calls to GlyphPage::setGlyphDataForIndex()
https://bugs.webkit.org/show_bug.cgi?id=116137
Reviewed by Andreas Kling.
Use zero for the glyp when the fontData pointer is null.
This aligns GlyphPageTreeNodeWinCE with the other implementations
and makes all ASSERT() pass in setGlyphDataForIndex().
* platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp:
(WebCore::GlyphPage::fill):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (150105 => 150106)
--- trunk/Source/WebCore/ChangeLog 2013-05-15 08:28:43 UTC (rev 150105)
+++ trunk/Source/WebCore/ChangeLog 2013-05-15 09:03:56 UTC (rev 150106)
@@ -1,3 +1,17 @@
+2013-05-15 Patrick Gansterer
+
+[WINCE] Fix calls to GlyphPage::setGlyphDataForIndex()
+https://bugs.webkit.org/show_bug.cgi?id=116137
+
+Reviewed by Andreas Kling.
+
+Use zero for the glyp when the fontData pointer is null.
+This aligns GlyphPageTreeNodeWinCE with the other implementations
+and makes all ASSERT() pass in setGlyphDataForIndex().
+
+* platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp:
+(WebCore::GlyphPage::fill):
+
2013-05-15 Benjamin Poulain
Do not bloat HTMLTokenizer with a giant inline InputStreamPreprocessor::peek
Modified: trunk/Source/WebCore/platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp (150105 => 150106)
--- trunk/Source/WebCore/platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp 2013-05-15 08:28:43 UTC (rev 150105)
+++ trunk/Source/WebCore/platform/graphics/wince/GlyphPageTreeNodeWinCE.cpp 2013-05-15 09:03:56 UTC (rev 150106)
@@ -48,7 +48,7 @@
if (!actualCodePages || (actualCodePages & fontCodePages))
setGlyphDataForIndex(offset + i, buffer[i], fontData);
else
-setGlyphDataForIndex(offset + i, buffer[i], 0);
+setGlyphDataForIndex(offset + i, 0, 0);
}
return true;
} else if (IMLangFontLinkType* langFontLink = fontCache()->getFontLinkInterface()) {
@@ -58,7 +58,7 @@
if (!actualCodePages || (actualCodePages & fontCodePages))
setGlyphDataForIndex(offset + i, buffer[i], fontData);
else
-setGlyphDataForIndex(offset + i, buffer[i], 0);
+setGlyphDataForIndex(offset + i, 0, 0);
}
return true;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [149855] trunk/Tools
Title: [149855] trunk/Tools
Revision 149855
Author par...@webkit.org
Date 2013-05-09 16:47:54 -0700 (Thu, 09 May 2013)
Log Message
[WIN][DRT] Remove duplicated (start|stop)_javascript_Threads()
https://bugs.webkit.org/show_bug.cgi?id=92371
Reviewed by Brent Fulgham.
Use _javascript_Threading.cpp where the same functionality is
implemented too. This reduces the dependency on the pthread
library. Also replace assert() with WebKit ASSERT().
* DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj:
* DumpRenderTree/win/DumpRenderTree.cpp:
(dumpHistoryItem):
(dumpBackForwardList):
* DumpRenderTree/win/DumpRenderTree.vcproj:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj
trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp
trunk/Tools/DumpRenderTree/win/DumpRenderTree.vcproj
Diff
Modified: trunk/Tools/ChangeLog (149854 => 149855)
--- trunk/Tools/ChangeLog 2013-05-09 23:41:26 UTC (rev 149854)
+++ trunk/Tools/ChangeLog 2013-05-09 23:47:54 UTC (rev 149855)
@@ -1,5 +1,22 @@
2013-05-09 Patrick Gansterer
+[WIN][DRT] Remove duplicated (start|stop)_javascript_Threads()
+https://bugs.webkit.org/show_bug.cgi?id=92371
+
+Reviewed by Brent Fulgham.
+
+Use _javascript_Threading.cpp where the same functionality is
+implemented too. This reduces the dependency on the pthread
+library. Also replace assert() with WebKit ASSERT().
+
+* DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj:
+* DumpRenderTree/win/DumpRenderTree.cpp:
+(dumpHistoryItem):
+(dumpBackForwardList):
+* DumpRenderTree/win/DumpRenderTree.vcproj:
+
+2013-05-09 Patrick Gansterer
+
[DRT] Replace _javascript_ThreadingPthreads.cpp with _javascript_Threading.cpp
https://bugs.webkit.org/show_bug.cgi?id=92505
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj (149854 => 149855)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj 2013-05-09 23:41:26 UTC (rev 149854)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj 2013-05-09 23:47:54 UTC (rev 149855)
@@ -107,6 +107,7 @@
+
@@ -150,6 +151,7 @@
+
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (149854 => 149855)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2013-05-09 23:41:26 UTC (rev 149854)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2013-05-09 23:47:54 UTC (rev 149855)
@@ -32,6 +32,7 @@
#include "EditingDelegate.h"
#include "FrameLoadDelegate.h"
#include "HistoryDelegate.h"
+#include "_javascript_Threading.h"
#include "PixelDumpSupport.h"
#include "PolicyDelegate.h"
#include "ResourceLoadDelegate.h"
@@ -45,7 +46,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -54,7 +54,6 @@
#include
#include
#include
-#include <_javascript_Core/_javascript_Core.h>
#include
#include
@@ -528,7 +527,7 @@
static void dumpHistoryItem(IWebHistoryItem* item, int indent, bool current)
{
-assert(item);
+ASSERT(item);
int start = 0;
if (current) {
@@ -645,17 +644,17 @@
if (FAILED(bfList->itemAtIndex(i, &item)))
return;
// something is wrong if the item from the last test is in the forward part of the b/f list
-assert(item != prevTestBFItem);
+ASSERT(item != prevTestBFItem);
COMPtr itemUnknown;
item->QueryInterface(&itemUnknown);
itemsToPrint.append(itemUnknown);
}
-
+
COMPtr currentItem;
if (FAILED(bfList->currentItem(¤tItem)))
return;
-assert(currentItem != prevTestBFItem);
+ASSERT(currentItem != prevTestBFItem);
COMPtr currentItemUnknown;
currentItem->QueryInterface(¤tItemUnknown);
itemsToPrint.append(currentItemUnknown);
@@ -1071,111 +1070,6 @@
return;
}
-static Boolean pthreadEqualCallback(const void* value1, const void* value2)
-{
-return (Boolean)pthread_equal(*(pthread_t*)value1, *(pthread_t*)value2);
-}
-
-static CFDictionaryKeyCallBacks pthreadKeyCallbacks = { 0, 0, 0, 0, pthreadEqualCallback, 0 };
-
-static pthread_mutex_t _javascript_ThreadsMutex = PTHREAD_MUTEX_INITIALIZER;
-static bool _javascript_ThreadsShouldTerminate;
-
-static const int _javascript_ThreadsCount = 4;
-static CFMutableDictionaryRef _javascript_Threads()
-{
-assert(pthread_mutex_trylock(&_javascript_ThreadsMutex) == EBUSY);
-static CFMutableDictionaryRef staticJavaScriptThreads;
-if (!staticJavaScriptThreads)
-staticJavaScriptThreads = CFDictionaryCreateMutable(0, 0, &pthreadKeyCallbacks, 0);
-return staticJavaScriptThreads;
-}
-
-// Loops forever, running a script and randomly respawning, until
-// _javascript_ThreadsShouldTermin
