Skip to content

Instantly share code, notes, and snippets.

View balazs's full-sized avatar

Balazs Kelemen balazs

  • Samsung Research America
  • Boston
View GitHub Profile
********* Finished testing of tst_Loading *********
Printing result for: total
benchmark: http://us.yahoo.com/
mean: 91 msecs +/- 0 msecs, +/- 0,000000 %
avg: 91 msecs
91, 92, 91, 93, 91, 91, 91, 92, 91, 92,
benchmark: http://google.com/
mean: 2 msecs +/- 0 msecs, +/- 0,000000 %
avg: 2 msecs
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
********* Finished testing of tst_Layout *********
Printing result for: total
benchmark: http://us.yahoo.com
mean: 29 msecs +/- 7 msecs, +/- 24,137931 %
avg: 25 msecs
35, 30, 20, 31, 29, 17, 28, 31, 18, 17,
benchmark: http://www.google.com/ncr
mean: 7 msecs +/- 3 msecs, +/- 42,857143 %
avg: 6 msecs
7, 8, 9, 9, 7, 7, 3, 1, 7, 2,
#0 convert_ARGB_PM_to_ARGB (dest=0x81c9188, src=0x81c82e8) at image/qimage.cpp:2270
#1 0xb4c10b5a in QImage::convertToFormat (this=0xbfc69d28, format=QImage::Format_ARGB32, flags={i = -1077502684})
at image/qimage.cpp:3444
#2 0xb4ec9c35 in QCommonStyle::generatedIconPixmap (this=0x80b9b48, iconMode=QIcon::Disabled, pixmap=@0xbfc69e84,
opt=0xbfc69e34) at styles/qcommonstyle.cpp:5971
#3 0xb4bf86b3 in QPixmapIconEngine::pixmap (this=0x81002d0, size=@0xbfc6a8e4, mode=QIcon::Disabled, state=QIcon::Off)
at image/qicon.cpp:284
#4 0xb4bf50f9 in QIcon::pixmap (this=0xbfc6dd84, size=@0xbfc6a8e4, mode=QIcon::Disabled, state=QIcon::Off)
at image/qicon.cpp:669
#5 0xb4eee832 in QCommonStyle::drawControl (this=0x80b9b48, element=QStyle::CE_ToolButtonLabel, opt=0xbfc6dd4c,
diff --git a/WebKit2/Shared/CoreIPCSupport/WebPageMessageKinds.h b/WebKit2/Shared/CoreIPCSupport/WebPageMessageKinds.h
index 491902c..ba484af 100644
--- a/WebKit2/Shared/CoreIPCSupport/WebPageMessageKinds.h
+++ b/WebKit2/Shared/CoreIPCSupport/WebPageMessageKinds.h
@@ -44,6 +44,7 @@ enum Kind {
MouseEvent,
PreferencesDidChange,
Reload,
+ RequestZoomRect,
RunJavaScriptInMainFrame,
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 44da029..c7b568c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-05 Balazs Kelemen <kb@inf.u-szeged.hu>
+
+ Reviewed by NOBODY (OOPS!).
+
+ [Qt] Remove redundant include paths from WebKit2.pro
<html>
<body>
<p>
<img src="a.jpg" style="background-image:url('bg.jpg')">
<img src="b.jpg">
</p>
</body>
</html>
diff --git a/Source/WebCore/bindings/V8JSCAPIShim/JavaScriptCore/APICast.cpp b/Source/WebCore/bindings/V8JSCAPIShim/JavaScriptCore/APICast.cpp
index b31a3bb..4cf6a3f 100644
--- a/Source/WebCore/bindings/V8JSCAPIShim/JavaScriptCore/APICast.cpp
+++ b/Source/WebCore/bindings/V8JSCAPIShim/JavaScriptCore/APICast.cpp
@@ -7,6 +7,8 @@ namespace V8JSCAPIShim {
ClassWrapper::~ClassWrapper()
{
+ if (!m_definition.className)
+ return;
diff --git a/Source/WebCore/platform/graphics/qt/ImageQt.cpp b/Source/WebCore/platform/graphics/qt/ImageQt.cpp
index 849435f..bf78032 100644
--- a/Source/WebCore/platform/graphics/qt/ImageQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/ImageQt.cpp
@@ -287,9 +287,11 @@ void BitmapImage::checkForSolidColor()
}
#if OS(WINDOWS)
+Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0);
+
diff --git a/Source/WebKit2/Shared/API/c/qt/WKImageQt.cpp b/Source/WebKit2/Shared/API/c/qt/WKImageQt.cpp
index d0975f6..bb7f89a 100644
--- a/Source/WebKit2/Shared/API/c/qt/WKImageQt.cpp
+++ b/Source/WebKit2/Shared/API/c/qt/WKImageQt.cpp
@@ -25,10 +25,27 @@
#include "ShareableBitmap.h"
#include "WKSharedAPICast.h"
#include "WebImage.h"
+#include <QPainter>
+#include <WebCore/IntSize.h>
diff --git a/Source/WebKit2/Shared/API/c/qt/WKImageQt.cpp b/Source/WebKit2/Shared/API/c/qt/WKImageQt.cpp
index d0975f6..bb7f89a 100644
--- a/Source/WebKit2/Shared/API/c/qt/WKImageQt.cpp
+++ b/Source/WebKit2/Shared/API/c/qt/WKImageQt.cpp
@@ -25,10 +25,27 @@
#include "ShareableBitmap.h"
#include "WKSharedAPICast.h"
#include "WebImage.h"
+#include <QPainter>
+#include <WebCore/IntSize.h>