Title: [102530] trunk/Source/WebCore
- Revision
- 102530
- Author
- [email protected]
- Date
- 2011-12-10 15:30:34 -0800 (Sat, 10 Dec 2011)
Log Message
[wx] Unreviewed build fixes. Add missing header for CPP
DOM bindings and add stubs for new DPI methods.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (102529 => 102530)
--- trunk/Source/WebCore/ChangeLog 2011-12-10 21:48:30 UTC (rev 102529)
+++ trunk/Source/WebCore/ChangeLog 2011-12-10 23:30:34 UTC (rev 102530)
@@ -1,3 +1,14 @@
+2011-12-10 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fixes. Add missing header for CPP
+ DOM bindings and add stubs for new DPI methods.
+
+ * bindings/scripts/CodeGeneratorCPP.pm:
+ (AddIncludesForType):
+ * platform/wx/ScreenWx.cpp:
+ (WebCore::screenHorizontalDPI):
+ (WebCore::screenVerticalDPI):
+
2011-12-10 Ryosuke Niwa <[email protected]>
Mac build fix. Remove an erroneous OVERRIDE.
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm (102529 => 102530)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm 2011-12-10 21:48:30 UTC (rev 102529)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm 2011-12-10 23:30:34 UTC (rev 102530)
@@ -309,6 +309,11 @@
$implIncludes{"WebDOMCustomVoidCallback.h"} = 1;
return;
}
+
+ # Also include CSSImportRule so that the toWebKit methods for subclasses are found
+ if ($type eq "CSSRule") {
+ $implIncludes{"WebDOMCSSImportRule.h"} = 1;
+ }
$implIncludes{"Node.h"} = 1 if $type eq "NodeList";
$implIncludes{"CSSMutableStyleDeclaration.h"} = 1 if $type eq "CSSStyleDeclaration";
Modified: trunk/Source/WebCore/platform/wx/ScreenWx.cpp (102529 => 102530)
--- trunk/Source/WebCore/platform/wx/ScreenWx.cpp 2011-12-10 21:48:30 UTC (rev 102529)
+++ trunk/Source/WebCore/platform/wx/ScreenWx.cpp 2011-12-10 23:30:34 UTC (rev 102530)
@@ -28,6 +28,7 @@
#include "Screen.h"
#include "IntRect.h"
#include "FloatRect.h"
+#include "NotImplemented.h"
#include "Widget.h"
#include <wx/defs.h>
@@ -35,17 +36,18 @@
#include <wx/gdicmn.h>
namespace WebCore {
-
-FloatRect scaleScreenRectToWidget(FloatRect rect, Widget*)
+
+int screenHorizontalDPI(Widget*)
{
- return rect;
+ notImplemented();
+ return 0;
}
-
-FloatRect scaleWidgetRectToScreen(FloatRect rect, Widget*)
+int screenVerticalDPI(Widget*)
{
- return rect;
+ notImplemented();
+ return 0;
}
-
+
FloatRect screenRect(Widget* widget)
{
/*
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
