Title: [98522] branches/chromium/874/Source/WebCore
- Revision
- 98522
- Author
- jam...@google.com
- Date
- 2011-10-26 15:12:29 -0700 (Wed, 26 Oct 2011)
Log Message
Merge 98112 - Fix Windows build.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::hasAnyAdditionalCompositedLayers):
TBR=jam...@chromium.org
Review URL: http://codereview.chromium.org/8363033
Modified Paths
Diff
Modified: branches/chromium/874/Source/WebCore/ChangeLog (98521 => 98522)
--- branches/chromium/874/Source/WebCore/ChangeLog 2011-10-26 22:11:28 UTC (rev 98521)
+++ branches/chromium/874/Source/WebCore/ChangeLog 2011-10-26 22:12:29 UTC (rev 98522)
@@ -1,3 +1,211 @@
+2011-10-21 Simon Fraser <simon.fra...@apple.com>
+
+ Fix Windows build.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::hasAnyAdditionalCompositedLayers):
+
+2011-10-21 Devdatta Deshpande <pwj...@motorola.com>
+
+ [Gtk] mousemove event always has metaKey == true
+ https://bugs.webkit.org/show_bug.cgi?id=35299
+
+ Reviewed by Martin Robinson.
+
+ GDK_MOD2_MASK doesn't always mean meta so we can't use it to identify
+ the meta key state. Use GDK_META_MASK instead.
+
+ Test: platform/gtk/fast/events/event-sender-metakey.html
+
+ * platform/gtk/PlatformMouseEventGtk.cpp:
+ (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+
+2011-10-21 Andreas Kling <kl...@webkit.org>
+
+ Style and Link elements' sheet() should return CSSStyleSheet.
+ https://bugs.webkit.org/show_bug.cgi?id=70608
+
+ Reviewed by Antti Koivisto.
+
+ Return a CSSStyleSheet* instead of a StyleSheet* in these functions
+ since we know they are always CSSStyleSheets.
+ Also remove some now-unnecessary isCSSStyleSheet() checks.
+
+ * dom/StyleElement.h:
+ (WebCore::StyleElement::sheet):
+ * html/HTMLLinkElement.cpp:
+ * html/HTMLLinkElement.h:
+ (WebCore::HTMLLinkElement::sheet):
+ * page/PageSerializer.cpp:
+ (WebCore::PageSerializer::serializeFrame):
+
+2011-10-21 Vsevolod Vlasov <vse...@chromium.org>
+
+ Web Inspector: Advanced search is working very slowly and does not show searching progress.
+ https://bugs.webkit.org/show_bug.cgi?id=70611
+
+ Search implementation changed so that we do not start searching in the next file unless
+ the previous one was already searched. This allows to interrupt search.
+ Not all search matches are added on UI by default now, only first 20 for each file.
+ Search progress information and search stop button were added to drawer status bar.
+
+ Reviewed by Pavel Feldman.
+
+ * English.lproj/localizedStrings.js:
+ * inspector/ContentSearchUtils.cpp:
+ (WebCore::ContentSearchUtils::getRegularExpressionMatchesByLines):
+ (WebCore::ContentSearchUtils::countRegularExpressionMatches):
+ * inspector/front-end/AdvancedSearchController.js:
+ (WebInspector.AdvancedSearchController.prototype._onSearchResult):
+ (WebInspector.AdvancedSearchController.prototype._onSearchFinished):
+ (WebInspector.AdvancedSearchController.prototype.startSearch):
+ (WebInspector.AdvancedSearchController.prototype.resetSearch):
+ (WebInspector.AdvancedSearchController.prototype.stopSearch):
+ (WebInspector.SearchView):
+ (WebInspector.SearchView.prototype.get statusBarItems):
+ (WebInspector.SearchView.prototype.get counterElement):
+ (WebInspector.SearchView.prototype.set resultsPane):
+ (WebInspector.SearchView.prototype.searchStarted):
+ (WebInspector.SearchView.prototype._updateSearchResultsMessage):
+ (WebInspector.SearchView.prototype._updateSearchProgress):
+ (WebInspector.SearchView.prototype.resetResults):
+ (WebInspector.SearchView.prototype._resetCounters):
+ (WebInspector.SearchView.prototype.nothingFound):
+ (WebInspector.SearchView.prototype.addSearchResult):
+ (WebInspector.SearchView.prototype.searchFinished):
+ (WebInspector.SearchView.prototype._searchStopButtonPressed):
+ (WebInspector.SearchResultsPane):
+ (WebInspector.FileBasedSearchResultsPane):
+ (WebInspector.FileBasedSearchResultsPane.prototype.addSearchResult):
+ (WebInspector.FileBasedSearchResultsPane.prototype._fileTreeElementExpanded):
+ (WebInspector.FileBasedSearchResultsPane.prototype._appendSearchMatches):
+ (WebInspector.FileBasedSearchResultsPane.prototype._appendShowMoreMatchesElement):
+ (WebInspector.FileBasedSearchResultsPane.prototype._showMoreMatchesElementSelected):
+ (WebInspector.FileBasedSearchResultsPane.prototype._addFileTreeElement):
+ (WebInspector.FileBasedSearchResultsPane.prototype._regexMatchRanges):
+ * inspector/front-end/Drawer.js:
+ (WebInspector.Drawer.prototype.hide):
+ * inspector/front-end/Images/statusbarButtonGlyphs.png:
+ * inspector/front-end/ScriptsSearchScope.js:
+ (WebInspector.ScriptsSearchScope):
+ (WebInspector.ScriptsSearchScope.prototype.performSearch.filterOutContentScripts):
+ (WebInspector.ScriptsSearchScope.prototype.performSearch.continueSearch):
+ (WebInspector.ScriptsSearchScope.prototype.performSearch.searchCallbackWrapper):
+ (WebInspector.ScriptsSearchScope.prototype.performSearch):
+ (WebInspector.ScriptsSearchScope.prototype.stopSearch):
+ * inspector/front-end/TimelinePanel.js:
+ (WebInspector.TimelinePanel.prototype._registerShortcuts):
+ * inspector/front-end/inspector.css:
+ (#drawer-status-bar .search-status-bar-item):
+ (#drawer-status-bar .search-status-bar-message):
+ (#drawer-status-bar .search-status-bar-progress):
+ (#drawer-status-bar .search-status-bar-stop-button-item):
+ (#drawer-status-bar .search-status-bar-stop-button .glyph):
+ (#drawer-status-bar .search-results-status-bar-message):
+ (.search-view .search-results):
+ (#search-results-pane-file-based .search-results-outline-disclosure):
+ (#search-results-pane-file-based .search-result):
+ (#search-results-pane-file-based .search-result:hover):
+ (#search-results-pane-file-based .show-more-matches):
+ (#search-results-pane-file-based .show-more-matches:hover):
+ (#search-results-pane-file-based .search-match:hover):
+ * inspector/front-end/utilities.js:
+ ():
+
+2011-10-20 Zhenyao Mo <z...@google.com>
+
+ Implement mechanism to enable privileged webgl extensions
+ https://bugs.webkit.org/show_bug.cgi?id=70538
+
+ Reviewed by Darin Fisher.
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::allowPrivilegedExtensions): check page/Settings flag.
+ * page/Settings.cpp: Add the flag.
+ (WebCore::Settings::Settings):
+ (WebCore::Settings::setPrivilegedWebGLExtensionsEnabled):
+ * page/Settings.h: Ditto.
+ (WebCore::Settings::privilegedWebGLExtensionsEnabled):
+
+2011-10-20 Pavel Podivilov <podivi...@chromium.org>
+
+ Web Inspector: first line in file is not highlighted.
+ https://bugs.webkit.org/show_bug.cgi?id=70504
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/SourceFrame.js:
+ (WebInspector.SourceFrame.prototype._initializeTextViewer):
+
+2011-10-21 Andreas Kling <kl...@webkit.org>
+
+ Simplify CSSStyleRule::setSelectorText().
+ https://bugs.webkit.org/show_bug.cgi?id=70607
+
+ Reviewed by Antti Koivisto.
+
+ Remove unnecessary isCSSStyleSheet() check and redundant Document finding
+ logic (CSSStyleSheet::document() will return the owner node's Document just
+ like this code would.)
+
+ * css/CSSStyleRule.cpp:
+ (WebCore::CSSStyleRule::setSelectorText):
+
+2011-10-21 Alejandro G. Castro <a...@igalia.com>
+
+ [cairo] Forward declaration of GraphicsContextState uses class instead of struct
+ https://bugs.webkit.org/show_bug.cgi?id=70522
+
+ The type is a struct not a class, replace the definition in the
+ forward declaration.
+
+ Reviewed by Martin Robinson.
+
+ * platform/graphics/cairo/PlatformContextCairo.h:
+
+2011-10-20 Andrey Kosyakov <ca...@chromium.org>
+
+ Web Inspector: make extension tests pass on chromium
+ https://bugs.webkit.org/show_bug.cgi?id=70334
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/ExtensionAPI.js:
+ (buildExtensionAPIInjectedScript):
+
+2011-10-20 Peter Rybin <peter.ry...@gmail.com>
+
+ Web Inspector: reimplement protocol backend/frontend source generator
+ https://bugs.webkit.org/show_bug.cgi?id=69295
+
+ Reviewed by Pavel Feldman.
+
+ Old 2-stage python+perf generator that uses intermediate IDL output is
+ being replaced with a solid python script. This is for simplicity and
+ as a base for the future JSON validator.
+
+ * CMakeLists.txt:
+ * CodeGenerators.pri:
+ * DerivedSources.make:
+ * GNUmakefile.am:
+ * WebCore.gyp/WebCore.gyp:
+ * inspector/CodeGeneratorInspector.pm: Removed.
+ * inspector/CodeGeneratorInspector.py: Added.
+ * inspector/Inspector.json:
+ * inspector/generate-inspector-idl: Removed.
+
+2011-10-20 Adam Barth <aba...@webkit.org>
+
+ Attemp to fix a bunch of tests PLATFORM(MAC). We can't use a static
+ map because that's shared between threads (and events exist in worker
+ threads). It migh be better to add a thread-specific map, but we can
+ do that in another patch.
+
+ * bindings/js/JSEventCustom.cpp:
+ (WebCore::toJS):
+ * bindings/v8/custom/V8EventCustom.cpp:
+ (WebCore::toV8):
+
2011-10-20 Simon Fraser <simon.fra...@apple.com>
Hidden composited iframes cause infinite loop
Modified: branches/chromium/874/Source/WebCore/rendering/RenderLayerCompositor.cpp (98521 => 98522)
--- branches/chromium/874/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-10-26 22:11:28 UTC (rev 98521)
+++ branches/chromium/874/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-10-26 22:12:29 UTC (rev 98522)
@@ -244,7 +244,7 @@
bool RenderLayerCompositor::hasAnyAdditionalCompositedLayers(const RenderLayer* rootLayer) const
{
- return m_compositedLayerCount > rootLayer->isComposited();
+ return m_compositedLayerCount > (rootLayer->isComposited() ? 1 : 0);
}
void RenderLayerCompositor::updateCompositingLayers(CompositingUpdateType updateType, RenderLayer* updateRoot)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
