Diff
Modified: trunk/Source/WebCore/ChangeLog (122572 => 122573)
--- trunk/Source/WebCore/ChangeLog 2012-07-13 13:53:29 UTC (rev 122572)
+++ trunk/Source/WebCore/ChangeLog 2012-07-13 14:00:06 UTC (rev 122573)
@@ -1,3 +1,16 @@
+2012-07-13 Joshua Netterfield <[email protected]>
+
+ [BlackBerry] Update about:* pages
+ https://bugs.webkit.org/show_bug.cgi?id=91121
+
+ Reviewed by Yong Li.
+
+ Update the about:config pages, and improve the aesthetics of the about:build, about:version, about:credits, about:memory, about:config, and similar pages.
+
+ No new tests, because there is no new funtionality.
+
+ * platform/network/blackberry/NetworkJob.cpp: Update the aesthetics of about:* pages
+
2012-07-13 Olivier Blin <[email protected]>
Fix checking for optional DeviceOrientationEvent.absolute in JSC bindings
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp (122572 => 122573)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2012-07-13 13:53:29 UTC (rev 122572)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2012-07-13 14:00:06 UTC (rev 122573)
@@ -20,6 +20,7 @@
#include "NetworkJob.h"
#include "AboutData.h"
+#include "AboutTemplate.html.cpp"
#include "Chrome.h"
#include "ChromeClient.h"
#include "CookieManager.h"
@@ -843,7 +844,8 @@
if (equalIgnoringCase(aboutWhat, "blank")) {
handled = true;
} else if (equalIgnoringCase(aboutWhat, "credits")) {
- result.append(String("<html><head><title>Open Source Credits</title> <style> .about {padding:14px;} </style> <meta name=\"viewport\" content=\"width=device-width, user-scalable=no\"></head><body>"));
+ result.append(writeHeader("Credits"));
+ result.append(String("<style> .about {padding:14px;} </style>"));
result.append(String(BlackBerry::Platform::WEBKITCREDITS));
result.append(String("</body></html>"));
handled = true;
@@ -883,16 +885,18 @@
result.append(String("</body></html>"));
handled = true;
} else if (equalIgnoringCase(aboutWhat, "version")) {
- result.append(String("<html><meta name=\"viewport\" content=\"width=device-width, user-scalable=no\"></head><body>"));
+ result.append(writeHeader("Version"));
+ result.append(String("<div class='box'><div class='box-title'>Build Time</div><br>"));
result.append(String(BlackBerry::Platform::BUILDTIME));
- result.append(String("</body></html>"));
+ result.append(String("</div><br><div style='font-size:10px;text-align:center;'>Also see the <A href=''>build information</A>.</body></html>"));
handled = true;
} else if (BlackBerry::Platform::debugSetting() > 0 && equalIgnoringCase(aboutWhat, "config")) {
result = configPage();
handled = true;
} else if (BlackBerry::Platform::debugSetting() > 0 && equalIgnoringCase(aboutWhat, "build")) {
- result.append(String("<html><head><title>BlackBerry Browser Build Information</title></head><body><table>"));
- result.append(String("<tr><td>Build Computer: </td><td>"));
+ result.append(writeHeader("Build"));
+ result.append(String("<div class='box'><div class='box-title'>Basic</div><table>"));
+ result.append(String("<tr><td>Built On: </td><td>"));
result.append(String(BlackBerry::Platform::BUILDCOMPUTER));
result.append(String("</td></tr>"));
result.append(String("<tr><td>Build User: </td><td>"));
@@ -900,11 +904,11 @@
result.append(String("</td></tr>"));
result.append(String("<tr><td>Build Time: </td><td>"));
result.append(String(BlackBerry::Platform::BUILDTIME));
- result.append(String("</td></tr><tr><td></td><td></td></tr>"));
+ result.append(String("</table></div><br>"));
result.append(String(BlackBerry::Platform::BUILDINFO_WEBKIT));
result.append(String(BlackBerry::Platform::BUILDINFO_PLATFORM));
result.append(String(BlackBerry::Platform::BUILDINFO_LIBWEBVIEW));
- result.append(String("</table></body></html>"));
+ result.append(String("</body></html>"));
handled = true;
} else if (equalIgnoringCase(aboutWhat, "memory")) {
result = memoryPage();
Modified: trunk/Source/WebKit/blackberry/ChangeLog (122572 => 122573)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-07-13 13:53:29 UTC (rev 122572)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-07-13 14:00:06 UTC (rev 122573)
@@ -1,3 +1,22 @@
+2012-07-13 Joshua Netterfield <[email protected]>
+
+ [BlackBerry] Update about:* pages
+ https://bugs.webkit.org/show_bug.cgi?id=91121
+
+ Reviewed by Yong Li.
+
+ Update the about:config pages, and improve the aesthetics of the about:build, about:version, about:credits, about:memory, about:config, and similar pages.
+
+ No new tests, because there is no new funtionality.
+
+ * WebCoreSupport/AboutData.cpp:
+ (WebCore):
+ (WebCore::writeFeatures):
+ (WebCore::numberToHTMLTr): Converted to template function, added bool specialization to write "true" and "false" instead of "1" and "0"
+ (WebCore::configPage):
+ (WebCore::memoryPage):
+ * WebCoreSupport/AboutTemplate.html.cpp: Template for BlackBerry about:* pages.
+
2012-07-12 Benjamin C Meyer <[email protected]>
WebPage::executeJavaScriptFunction crashes when there is an exception
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/AboutData.cpp (122572 => 122573)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/AboutData.cpp 2012-07-13 13:53:29 UTC (rev 122572)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/AboutData.cpp 2012-07-13 14:00:06 UTC (rev 122573)
@@ -18,6 +18,7 @@
#include "config.h"
#include "AboutData.h"
+#include "AboutTemplate.html.cpp"
#include "CString.h"
#include "JSDOMWindow.h"
@@ -35,20 +36,33 @@
namespace WebCore {
-static String numberToHTMLTr(const String& description, unsigned number)
+static String writeFeatures(const Vector<String>& trueList, const Vector<String>& falseList)
{
+ String ret;
+ for (unsigned int i = 0, j = 0; i < trueList.size() || j < falseList.size();) {
+ bool pickFromFalse = ((i >= trueList.size()) || (j < falseList.size() && strcmp(falseList[j].ascii().data(), trueList[i].ascii().data()) < 0));
+ const String& item = (pickFromFalse ? falseList : trueList)[ (pickFromFalse ? j : i)++ ];
+ ret += String("<tr><td><div class='" + String(pickFromFalse ? "false" : "true") + "'" + (item.length() >= 30 ? " style='font-size:10px;' " : "") + ">" + item + "</div></td></tr>");
+ }
+ return ret;
+}
+
+template<class T> String numberToHTMLTr(const String& description, T number)
+{
return String("<tr><td>") + description + "</td><td>" + String::number(number) + "</td></tr>";
}
+template<> String numberToHTMLTr<bool>(const String& description, bool truth)
+{
+ return String("<tr><td>") + description + "</td><td>" + (truth?"true":"false") + "</td></tr>";
+}
+
String configPage()
{
String page;
-
#if !defined(PUBLIC_BUILD) || !PUBLIC_BUILD
- page = String("<!DOCTYPE html><html><head><title>BlackBerry Browser Configuration Information</title><meta name=\"viewport\" content=\"width=700\">")
- + "<style>@media all and (orientation:landscape) { body { -webkit-column-count:2; -webkit-column-rule:solid; font-size:8px; } h1 { -webkit-column-span: all; } ul { font-size: 50%; } } td,li { text-overflow: ellipsis; overflow: hidden; } .list2 { width: 49%; float:left; padding-right:1px; } ul { list-style-type:none; padding:0px; margin:0px; } h1,h2,h3 { text-align:center; margin:0; } h2 { padding:1em 0 0 0; clear:both; } li,td { font-family:\"DejaVu Sans Condensed\"; }</style>"
- + "</head><body><h1>BlackBerry Browser Configuration Information</h1>"
- + "<h2>Compiler Information</h2><table>"
+ page = writeHeader("Configuration");
+ + "<div class=\"box\"><div class=\"box-title\">Compiler Information</div><table class='fixed-table'><col width=75%><col width=25%>"
#if COMPILER(MSVC)
+ "<tr><td>Microsoft Visual C++</td><td>MSVC</td></tr>"
+ "<tr><td>_MSC_VER</td><td>" + String::number(_MSC_VER) + "</td></tr>"
@@ -67,7 +81,7 @@
// Add "" to satisfy check-webkit-style.
+ "";
- page += String("</table><h2>CPU Information</h2><table>")
+ page += String("</table></div><br><div class='box'><div class='box-title'>CPU Information</div><table class='fixed-table'><col width=75%><col width=25%>")
#if CPU(X86)
+ "<tr><td>X86</td><td></td></tr>"
#elif CPU(ARM)
@@ -86,7 +100,7 @@
#endif
+ "</td></tr>";
- page += String("</table><h2>Platform Information</h2><table>")
+ page += String("</table></div><br><div class='box'><div class='box-title'>Platform Information</div><table class='fixed-table'><col width=75%><col width=25%>")
+ "<tr><td>WebKit Version</td><td>" + String::number(WEBKIT_MAJOR_VERSION) + "." + String::number(WEBKIT_MINOR_VERSION) + "</td></tr>"
+ "<tr><td>BlackBerry</td><td>"
#if PLATFORM(BLACKBERRY)
@@ -104,22 +118,24 @@
+ "</td></tr>";
BlackBerry::Platform::Settings* settings = BlackBerry::Platform::Settings::instance();
- page += String("</table><h2>Platform Settings</h2><table>");
+ page += String("</table></div><br><div class='box'><div class='box-title'>Platform Settings</div><table style='font-size:11px;' class='fixed-table'><col width=75%><col width=25%>");
page += numberToHTMLTr("isRSSFilteringEnabled", settings->isRSSFilteringEnabled());
page += numberToHTMLTr("secondaryThreadStackSize", settings->secondaryThreadStackSize());
page += numberToHTMLTr("maxPixelsPerDecodedImage", settings->maxPixelsPerDecodedImage());
page += numberToHTMLTr("shouldReportLowMemoryToUser", settings->shouldReportLowMemoryToUser());
page += numberToHTMLTr("numberOfBackingStoreTiles", settings->numberOfBackingStoreTiles());
- page += numberToHTMLTr("maximumNumberOfBackingStoreTilesAcrossProcesses", settings->maximumNumberOfBackingStoreTilesAcrossProcesses());
+ page += numberToHTMLTr("maximumNumberOfBacking...AcrossProcesses", settings->maximumNumberOfBackingStoreTilesAcrossProcesses());
page += numberToHTMLTr("tabsSupportedByClient", settings->tabsSupportedByClient());
page += numberToHTMLTr("contextMenuEnabled", settings->contextMenuEnabled());
page += numberToHTMLTr("selectionEnabled", settings->selectionEnabled());
+ page += numberToHTMLTr("fineCursorControlEnabled", settings->fineCursorControlEnabled());
page += numberToHTMLTr("alwaysShowKeyboardOnFocus", settings->alwaysShowKeyboardOnFocus());
page += numberToHTMLTr("allowCenterScrollAdjustmentForInputFields", settings->allowCenterScrollAdjustmentForInputFields());
page += numberToHTMLTr("unrestrictedResizeEvents", settings->unrestrictedResizeEvents());
page += numberToHTMLTr("isBridgeBrowser", settings->isBridgeBrowser());
page += numberToHTMLTr("isWebGLSupported", settings->isWebGLSupported());
page += numberToHTMLTr("showImageLocationOptionsInGCM", settings->showImageLocationOptionsInGCM());
+ page += numberToHTMLTr("forceGLES2WindowUsage", settings->forceGLES2WindowUsage());
page += numberToHTMLTr("maxClickableSpeed", settings->maxClickableSpeed());
page += numberToHTMLTr("maxJitterRadiusClick", settings->maxJitterRadiusClick());
page += numberToHTMLTr("maxJitterRadiusTap", settings->maxJitterRadiusTap());
@@ -131,51 +147,33 @@
page += numberToHTMLTr("maxJitterDistanceTap", settings->maxJitterDistanceTap());
page += numberToHTMLTr("maxJitterDistanceSingleTouchMove", settings->maxJitterDistanceSingleTouchMove());
page += numberToHTMLTr("maxJitterDistanceTouchHold", settings->maxJitterDistanceTouchHold());
- page += numberToHTMLTr("maxJitterDistanceHandleDrag", settings->maxJitterDistanceHandleDrag());
page += numberToHTMLTr("maxJitterDistanceTapHighlight", settings->maxJitterDistanceTapHighlight());
+ page += numberToHTMLTr("maxJitterDistanceHandleDrag", settings->maxJitterDistanceHandleDrag());
page += numberToHTMLTr("topFatFingerPadding", settings->topFatFingerPadding());
page += numberToHTMLTr("rightFatFingerPadding", settings->rightFatFingerPadding());
page += numberToHTMLTr("bottomFatFingerPadding", settings->bottomFatFingerPadding());
+ page += numberToHTMLTr("maxSelectionNeckHeight", settings->maxSelectionNeckHeight());
page += numberToHTMLTr("leftFatFingerPadding", settings->leftFatFingerPadding());
-#define FOR_EACH_TRUE_LIST() \
- for (unsigned int i = 0; i < trueList.size(); ++i) \
- page += String("<li>") + trueList[i] + "</li>"
-
-#define FOR_EACH_FALSE_LIST() \
- for (unsigned int i = 0; i < falseList.size(); ++i) \
- page += String("<li>") + falseList[i] + "</li>"
-
Vector<String> trueList, falseList;
#include "AboutDataEnableFeatures.cpp"
- page += String("</table><h2>WebKit ENABLE Information</h2><div class=\"list2\">");
- page += String("<h3>ENABLE</h3><ul>");
- FOR_EACH_TRUE_LIST();
- page += String("</ul></div><div class=\"list2\"><h3>don't ENABLE</h3><ul>");
- FOR_EACH_FALSE_LIST();
- page += String("</ul></div>");
+ page += String("</table></div><br><div class='box'><div class='box-title'>WebKit Features (ENABLE_)</div><table class='fixed-table'>");
+ page += writeFeatures(trueList, falseList);
+
trueList.clear();
falseList.clear();
#include "AboutDataHaveFeatures.cpp"
- page += String("</table><h2>WebKit HAVE Information</h2><div class=\"list2\">");
- page += String("<h3>HAVE</h3><ul>");
- FOR_EACH_TRUE_LIST();
- page += String("</ul></div><div class=\"list2\"><h3>don't HAVE</h3><ul>");
- FOR_EACH_FALSE_LIST();
- page += String("</ul></div>");
+ page += String("</table></div><br><div class='box'><div class='box-title'>WebKit Features (HAVE_)</div><table class='fixed-table'>");
+ page += writeFeatures(trueList, falseList);
+
trueList.clear();
falseList.clear();
#include "AboutDataUseFeatures.cpp"
- page += String("<h2>WebKit USE Information</h2><div class=\"list2\">");
- page += String("<h3>USE</h3><ul>");
- FOR_EACH_TRUE_LIST();
- page += String("</ul></div><div class=\"list2\"><h3>don't USE</h3><ul>");
- FOR_EACH_FALSE_LIST();
- page += String("</ul></div>");
-
- page += String("</body></html>");
+ page += String("</table></div><br><div class='box'><div class='box-title'>WebKit Features (USE_)</div><table class='fixed-table'>");
+ page += writeFeatures(trueList, falseList);
+ page += String("</table></div></body></html>");
#endif
return page;
@@ -205,15 +203,14 @@
{
String page;
- // generate memory information
- page = "<html><head><title>BlackBerry Browser Memory Information</title></head><body><h2>BlackBerry Browser Memory Information</h2>";
+ page = writeHeader("Memory")
+ + "<div class=\"box\"><div class=\"box-title\">Cache Information<br><div style='font-size:11px;color:#A8A8A8'>Size, Living, and Decoded are expressed in KB.</div><br></div><table class='fixed-table'><col width=75%><col width=25%>";
// generate cache information
MemoryCache* cacheInc = memoryCache();
MemoryCache::Statistics cacheStat = cacheInc->getStatistics();
- page += "<h2>Cache Information</h2>"
- "<table align=\"center\" rules=\"all\"><tr> <th>Item</th> <th>Count</th> <th>Size<br>KB</th> <th>Living<br>KB</th> <th>Decoded<br>KB</th></tr>";
+ page += "<tr> <th align=left>Item</th> <th align=left>Count</th> <th align=left>Size</th> <th align=left>Living</th> <th align=left>Decoded</th></tr>";
MemoryCache::TypeStatistic total;
total.count = cacheStat.images.count + cacheStat.cssStyleSheets.count
@@ -234,7 +231,7 @@
#endif
page += cacheTypeStatisticToHTMLTr("Fonts", cacheStat.fonts);
- page += "</table>";
+ page += "</table></div><br>";
#if !defined(PUBLIC_BUILD) || !PUBLIC_BUILD
@@ -244,7 +241,7 @@
OwnPtr<JSC::TypeCountSet> objectTypeCounts = mainHeap.objectTypeCounts();
OwnPtr<JSC::TypeCountSet> protectedObjectTypeCounts = mainHeap.protectedObjectTypeCounts();
- page += "<h2>JS engine memory usage</h2><table align=\"center\" rules=\"all\">";
+ page += "<div class='box'><div class='box-title'>JS engine memory usage</div><table class='fixed-table'><col width=75%><col width=25%>";
page += numberToHTMLTr("Stack size", jscMemoryStat.stackBytes);
page += numberToHTMLTr("JIT memory usage", jscMemoryStat.JITBytes);
@@ -255,20 +252,20 @@
page += numberToHTMLTr("Protected object count", mainHeap.protectedObjectCount());
page += numberToHTMLTr("Protected global object count", mainHeap.protectedGlobalObjectCount());
- page += "</table>";
+ page += "</table></div><br>";
- page += "<h3>Object type counts</h3><table align=\"center\" rules=\"all\">";
+ page += "<div class='box'><div class='box-title'>Object type counts</div><table class='fixed-table'><col width=75%><col width=25%>";
dumpJSCTypeCountSetToTableHTML(page, objectTypeCounts.get());
- page += "</table>";
+ page += "</table></div><br>";
- page += "<h3>Protected object type counts</h3><table align=\"center\" rules=\"all\">";
+ page += "<div class='box'><div class='box-title'>Protected object type counts</div><table class='fixed-table'><col width=75%><col width=25%>";
dumpJSCTypeCountSetToTableHTML(page, protectedObjectTypeCounts.get());
- page += "</table>";
+ page += "</table></div><br>";
// Malloc info.
struct mallinfo mallocInfo = mallinfo();
- page += "<h2>Malloc Information</h2><table align=\"center\" rules=\"all\">";
+ page += "<div class='box'><div class='box-title'>Malloc Information</div><table class='fixed-table'><col width=75%><col width=25%>";
page += numberToHTMLTr("Total space in use", mallocInfo.usmblks + mallocInfo.uordblks);
page += numberToHTMLTr("Total space in free blocks", mallocInfo.fsmblks + mallocInfo.fordblks);
@@ -286,7 +283,7 @@
if (!stat(String::format("/proc/%u/as", getpid()).latin1().data(), &processInfo))
page += numberToHTMLTr("Process total mapped memory", processInfo.st_size);
- page += "</table>";
+ page += "</table></div>";
#endif
page += "</body></html>";
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in (122572 => 122573)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in 2012-07-13 13:53:29 UTC (rev 122572)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in 2012-07-13 14:00:06 UTC (rev 122573)
@@ -1,42 +1,34 @@
-3D_CANVAS
-3D_PLUGIN
3D_RENDERING
ACCELERATED_2D_CANVAS
ANIMATION_API
ASSEMBLER
ASSEMBLER_WX_EXCLUSIVE
BATTERY_STATUS
-BLACKBERRY_CREDENTIAL_PERSIST
-BLACKBERRY_DEBUG_MEMORY
BLOB
BRANCH_COMPACTION
CHANNEL_MESSAGING
CLASSIC_INTERPRETER
-CODEBLOCK_SAMPLING
+CLIENT_BASED_GEOLOCATION
COMPARE_AND_SWAP
COMPUTED_GOTO_CLASSIC_INTERPRETER
-CONTEXT_MENUS
CSS_FILTERS
CSS_GRID_LAYOUT
+CSS_IMAGE_SET
CSS_SHADERS
DASHBOARD_SUPPORT
+CUSTOM_SCHEME_HANDLER
DATALIST
DATA_TRANSFER_ITEMS
-DEBUG_MATH_LAYOUT
+DASHBOARD_SUPPORT
DEBUG_WITH_BREAKPOINT
DETAILS
DEVICE_ORIENTATION
DFG_JIT
DIRECTORY_UPLOAD
-DOUBLE_TAP_CENTERS
DOWNLOAD_ATTRIBUTE
DRAG_SUPPORT
-DRT
-EVENT_MODE_METATAGS
EXECUTABLE_ALLOCATOR_DEMAND
EXECUTABLE_ALLOCATOR_FIXED
-EXPERIMENTAL_FEATURE
-FAST_MALLOC_MATCH_VALIDATION
FAST_MOBILE_SCROLLING
FILE_SYSTEM
FILTERS
@@ -44,15 +36,14 @@
FTPDIR
FULLSCREEN_API
GAMEPAD
-GC_LOGGING
GC_VALIDATION
GEOLOCATION
GESTURE_EVENTS
-GESTURE_RECOGNIZER
-GGC
+GLIB_SUPPORT
GLOBAL_FASTMALLOC_NEW
HIGH_DPI_CANVAS
ICONDATABASE
+IFRAME_SEAMLESS
IMAGE_DECODER_DOWN_SAMPLING
INDEXED_DATABASE
INPUT_SPEECH
@@ -67,16 +58,14 @@
_javascript__DEBUGGER
_javascript__I18N_API
JAVA_BRIDGE
+_javascript__DEBUGGER
JIT
-JIT_OPTIMIZE_PROPERTY_ACCESS
-JIT_USE_SOFT_MODULO
JIT_VERBOSE
JIT_VERBOSE_OSR
-LARGE_HEAP
LEGACY_NOTIFICATIONS
+LEGACY_WEBKIT_BLOB_BUILDER
LINK_PREFETCH
LLINT
-MAC_JAVA_BRIDGE
MATHML
MEDIA_SOURCE
MEDIA_STATISTICS
@@ -89,18 +78,17 @@
MUTATION_OBSERVERS
NETSCAPE_PLUGIN_API
NETSCAPE_PLUGIN_METADATA_CACHE
-NEW_XML
+NETWORK_INFO
NOTIFICATIONS
-NO_LISTBOX_RENDERING
OPCODE_SAMPLING
-OPCODE_STATS
OPENTYPE_SANITIZER
ORIENTATION_EVENTS
+OVERFLOW_SCROLLING
PAGE_VISIBILITY_API
PAN_SCROLLING
+PARSED_STYLE_SHEET_CACHING
+PAGE_POPUP
PARALLEL_GC
-PARALLEL_JOBS
-PASSWORD_ECHO
PLUGIN_PACKAGE_SIMPLE_HASH
PLUGIN_PROCESS
PLUGIN_PROXY_FOR_VIDEO
@@ -113,21 +101,17 @@
REPAINT_THROTTLING
REQUEST_ANIMATION_FRAME
RUBBER_BANDING
-RUN_TIME_HEURISTICS
-RXI_IMAGE_FORMAT
SAMPLING_COUNTERS
SAMPLING_FLAGS
SAMPLING_REGIONS
SAMPLING_THREAD
+SCRIPTED_SPEECH
SHADOW_DOM
SHARED_WORKERS
SIMPLE_HEAP_PROFILING
-SINGLE_THREADED
-SKIA_GPU_CANVAS
-SKIA_TEXT
SMOOTH_SCROLLING
-SPEECH_INPUT
SPELLCHECK
+SUBPIXEL_LAYOUT
SQL_DATABASE
STYLE_SCOPED
SVG
@@ -135,10 +119,11 @@
SVG_FONTS
TEXT_CARET
TEXT_NOTIFICATIONS_ONLY
+THREADED_SCROLLING
THREADING_GENERIC
+THREADED_SCROLLING
THREADING_LIBDISPATCH
THREADING_OPENMP
-THREADING_SCROLLING
TOUCH_EVENTS
TOUCH_ICON_LOADING
VALUE_PROFILER
@@ -152,14 +137,11 @@
WEBKIT2
WEB_ARCHIVE
WEB_AUDIO
-WEB_PROCESS_SANDBOX
+WEB_INTENTS
WEB_SOCKETS
WEB_TIMING
WORKERS
WRITE_BARRIER_PROFILING
-WTF_MALLOC_VALIDATION
-XHR_RESPONSE_BLOB
-XHTMLMP
XSLT
YARR_JIT
YARR_JIT_DEBUG
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataHaveFeatures.in (122572 => 122573)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataHaveFeatures.in 2012-07-13 13:53:29 UTC (rev 122572)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataHaveFeatures.in 2012-07-13 14:00:06 UTC (rev 122573)
@@ -1,37 +1,24 @@
ACCESSIBILITY
-ASSEMBLER
-AVCF
-CG_INTERPOLATION_MEDIUM
-COMPUTED_GOTO
DISPATCH_H
-DTRACE
ERRNO_H
-HEADER_DETECTION_H
HOSTED_CORE_ANIMATION
-INTTYPES_H
INVERTED_WHEEL_EVENTS
ISDEBUGGERPRESENT
LANGINFO_H
+LAYER_HOSTING_IN_WINDOW_SERVER
MADV_DONTNEED
MADV_FREE
MADV_FREE_REUSE
-MERGESORT
MMAP
NETWORK_CFDATA_ARRAY_CALLBACK
-NULLPTR
-PATH_BASED_BORDER_RADIUS_DRAWING
PTHREAD_H
-PTHREAD_MACHDEP_H
PTHREAD_NP_H
PTHREAD_RWLOCK
PTHREAD_SETNAME_NP
-QRAWFONT
-QSTYLE
READLINE
RUNLOOP_TIMER
SBRK
SIGNAL_H
-STDINT_H
STRINGS_H
STRNSTR
SYS_PARAM_H
@@ -40,8 +27,5 @@
TIMEGM
TM_GMTOFF
TM_ZONE
-VARIADIC_MACRO
VASPRINTF
VIRTUALALLOC
-WEBCOMPOSITOR
-WKQCA
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataUseFeatures.in (122572 => 122573)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataUseFeatures.in 2012-07-13 13:53:29 UTC (rev 122572)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataUseFeatures.in 2012-07-13 14:00:06 UTC (rev 122573)
@@ -1,6 +1,5 @@
-ACCELERATE
ACCELERATED_COMPOSITING
-ACCELERATED_COMPOSITING_PLUGIN_LAYER
+ARENA_ALLOC_ALIGNMENT_INTEGER
ATSUI
AUTOCORRECTION_PANEL
AUTOMATIC_TEXT_REPLACEMENT
@@ -14,6 +13,7 @@
CG
CG_INTERPOLATION_MEDIUM
CHROME_NETWORK_STACK
+CHROMIUM_NET
CONCATENATED_IMPULSE_RESPONSES
CONSOLE_ENTRY_POINT
COREAUDIO
@@ -52,13 +52,7 @@
PROTECTION_SPACE_AUTH_CALLBACK
PTHREADS
PTHREAD_GETSPECIFIC_DIRECT
-QT4_UNICODE
-QTKIT
-QT_MOBILITY_SYSTEMINFO
-QT_MULTIMEDIA
QUERY_PERFORMANCE_COUNTER
-QXMLQUERY
-QXMLSTREAM
REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR
REQUEST_ANIMATION_FRAME_TIMER
SAFARI_THEME
Added: trunk/Source/WebKit/blackberry/WebCoreSupport/AboutTemplate.html.cpp (0 => 122573)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/AboutTemplate.html.cpp (rev 0)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/AboutTemplate.html.cpp 2012-07-13 14:00:06 UTC (rev 122573)
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+static String writeHeader(const String& header)
+{
+ return "<!DOCTYPE html><html>"
+ "<head>"
+ " <style>.title{text-align:center;color:white;font-size:28pt;}.box{padding:10px;border:2px solid gray;margin:0px;background:black;color:white;-webkit-border-radius: 10px;}.box-title{text-align:center;font-weight:bold;}.true {color:green;}.false {color: red;text-decoration: line-through;}.fixed-table{color:white;border-collapse:collapse;width:100%} tr:nth-child(2n){color:#A8A8A8;}</style>"
+ " <title>"+title+"</title>"
+ " <meta name=\"viewport\" content=\"width=device-width, initial-scale=1, maximum-scale=1\">"
+ " <style>@media all and (orientation:landscape) { .main { -webkit-column-count:2; -webkit-column-rule:solid; font-size:12px; } h1 { -webkit-column-span: all; } ul { font-size: 75%; } } td,li { text-overflow: ellipsis; overflow: hidden; }</style>"
+ "</head>"
+ "<body topmargin='10'>"
+ " <div class='box'><div class='title'><img alt='BlackBerry Browser Logo' src='' /> "+title+"</div></div><br>"
+ " <div class='main'>";
+}
