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 <par...@webkit.org>
+ Various small WinCE build fixes
+
+ * jsc.cpp:
+ (main):
+
+2013-11-02 Patrick Gansterer <par...@webkit.org>
+
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 <http://webkit.org/b/55222>.
::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 <par...@webkit.org>
+
+ 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 <a...@apple.com>
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/platform/graphics/wince/ImageWinCE.cpp 2013-11-02 17:26:24 UTC (rev 158491)
+++ trunk/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp 2013-11-02 17:33:15 UTC (rev 158492)
@@ -59,7 +59,7 @@
return false;
}
-bool BitmapImage::getHBITMAPOfSize(HBITMAP bmp, LPSIZE size)
+bool BitmapImage::getHBITMAPOfSize(HBITMAP bmp, const IntSize* size)
{
if (!bmp)
return false;
@@ -78,9 +78,9 @@
IntSize imageSize = BitmapImage::size();
if (size)
- drawFrameMatchingSourceSize(&gc, FloatRect(0, 0, bmpInfo.bmWidth, bmpInfo.bmHeight), IntSize(*size), ColorSpaceDeviceRGB, CompositeCopy);
+ drawFrameMatchingSourceSize(&gc, FloatRect(0, 0, bmpInfo.bmWidth, bmpInfo.bmHeight), *size, ColorSpaceDeviceRGB, CompositeCopy);
else
- draw(&gc, FloatRect(0, 0, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0, 0, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, CompositeCopy, BlendModeNormal);
+ draw(&gc, FloatRect(0, 0, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0, 0, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, CompositeCopy, BlendModeNormal, ImageOrientationDescription());
}
SelectObject(hdc.get(), hOldBmp);
@@ -98,14 +98,14 @@
size_t currentFrame = m_currentFrame;
m_currentFrame = i;
- draw(ctxt, dstRect, FloatRect(0, 0, srcSize.width(), srcSize.height()), styleColorSpace, compositeOp, BlendModeNormal);
+ draw(ctxt, dstRect, FloatRect(0, 0, srcSize.width(), srcSize.height()), styleColorSpace, compositeOp, BlendModeNormal, ImageOrientationDescription());
m_currentFrame = currentFrame;
return;
}
// No image of the correct size was found, fallback to drawing the current frame
IntSize imageSize = BitmapImage::size();
- draw(ctxt, dstRect, FloatRect(0, 0, imageSize.width(), imageSize.height()), styleColorSpace, compositeOp, BlendModeNormal);
+ draw(ctxt, dstRect, FloatRect(0, 0, imageSize.width(), imageSize.height()), styleColorSpace, compositeOp, BlendModeNormal, ImageOrientationDescription());
}
void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRectIn, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
Modified: trunk/Source/WebCore/platform/graphics/wince/PlatformPathWinCE.h (158491 => 158492)
--- trunk/Source/WebCore/platform/graphics/wince/PlatformPathWinCE.h 2013-11-02 17:26:24 UTC (rev 158491)
+++ trunk/Source/WebCore/platform/graphics/wince/PlatformPathWinCE.h 2013-11-02 17:33:15 UTC (rev 158492)
@@ -23,6 +23,7 @@
#include "FloatPoint.h"
#include "FloatRect.h"
#include "Path.h"
+#include <windows.h>
#include <wtf/Vector.h>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/win/PopupMenuWin.h (158491 => 158492)
--- trunk/Source/WebCore/platform/win/PopupMenuWin.h 2013-11-02 17:26:24 UTC (rev 158491)
+++ trunk/Source/WebCore/platform/win/PopupMenuWin.h 2013-11-02 17:33:15 UTC (rev 158492)
@@ -29,11 +29,8 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
+#include <wtf/win/GDIObject.h>
-typedef struct HWND__* HWND;
-typedef struct HDC__* HDC;
-typedef struct HBITMAP__* HBITMAP;
-
namespace WebCore {
class FrameView;
Modified: trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp (158491 => 158492)
--- trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2013-11-02 17:26:24 UTC (rev 158491)
+++ trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2013-11-02 17:33:15 UTC (rev 158492)
@@ -454,7 +454,7 @@
// Calculate our min-height
int minHeight = style->fontMetrics().height();
- minHeight = max(minHeight, dropDownBoxMinHeight);
+ minHeight = std::max(minHeight, dropDownBoxMinHeight);
style->setMinHeight(Length(minHeight, Fixed));
Modified: trunk/Source/WebKit/wince/ChangeLog (158491 => 158492)
--- trunk/Source/WebKit/wince/ChangeLog 2013-11-02 17:26:24 UTC (rev 158491)
+++ trunk/Source/WebKit/wince/ChangeLog 2013-11-02 17:33:15 UTC (rev 158492)
@@ -1,3 +1,11 @@
+2013-11-02 Patrick Gansterer <par...@webkit.org>
+
+ Various small WinCE build fixes
+
+ * WebCoreSupport/FrameLoaderClientWinCE.cpp:
+ (WebKit::FrameLoaderClientWinCE::transitionToCommittedForNewPage):
+ * WebView.cpp:
+
2013-10-03 Sam Weinig <s...@webkit.org>
Remove shouldRubberBandInDirection from the WKBundlePageUIClient
Modified: trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp (158491 => 158492)
--- trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp 2013-11-02 17:26:24 UTC (rev 158491)
+++ trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp 2013-11-02 17:33:15 UTC (rev 158492)
@@ -32,6 +32,7 @@
#include "FrameView.h"
#include "HTMLFormElement.h"
#include "MIMETypeRegistry.h"
+#include "MainFrame.h"
#include "NotImplemented.h"
#include "Page.h"
#include "PluginDatabase.h"
@@ -607,9 +608,9 @@
if (isMainFrame) {
RECT rect;
m_webView->frameRect(&rect);
- frameView = FrameView::create(m_frame, IntRect(rect).size());
+ frameView = FrameView::create(*m_frame, IntRect(rect).size());
} else
- frameView = FrameView::create(m_frame);
+ frameView = FrameView::create(*m_frame);
m_frame->setView(frameView);
Modified: trunk/Source/WebKit/wince/WebView.cpp (158491 => 158492)
--- trunk/Source/WebKit/wince/WebView.cpp 2013-11-02 17:26:24 UTC (rev 158491)
+++ trunk/Source/WebKit/wince/WebView.cpp 2013-11-02 17:33:15 UTC (rev 158492)
@@ -42,6 +42,7 @@
#include "InitializeThreading.h"
#include "InspectorClientWinCE.h"
#include "IntSize.h"
+#include "MainFrame.h"
#include "NotImplemented.h"
#include "Page.h"
#include "PlatformKeyboardEvent.h"
