Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: Source/web/WebViewImpl.h

Issue 1330233003: Revert of Avoid style clobbering in setCompositionFromExistingText. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/paint/InlineTextBoxPainter.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 503
504 // Exposed for tests. 504 // Exposed for tests.
505 unsigned numLinkHighlights() { return m_linkHighlights.size(); } 505 unsigned numLinkHighlights() { return m_linkHighlights.size(); }
506 LinkHighlightImpl* linkHighlight(int i) { return m_linkHighlights[i].get(); } 506 LinkHighlightImpl* linkHighlight(int i) { return m_linkHighlights[i].get(); }
507 507
508 WebSettingsImpl* settingsImpl(); 508 WebSettingsImpl* settingsImpl();
509 509
510 // Returns the bounding box of the block type node touched by the WebPoint. 510 // Returns the bounding box of the block type node touched by the WebPoint.
511 WebRect computeBlockBound(const WebPoint&, bool ignoreClipping); 511 WebRect computeBlockBound(const WebPoint&, bool ignoreClipping);
512 512
513 // Exposed for tests.
514 WebVector<WebCompositionUnderline> compositionUnderlines() const;
515
513 WebLayerTreeView* layerTreeView() const { return m_layerTreeView; } 516 WebLayerTreeView* layerTreeView() const { return m_layerTreeView; }
514 517
515 bool matchesHeuristicsForGpuRasterizationForTesting() const { return m_match esHeuristicsForGpuRasterization; } 518 bool matchesHeuristicsForGpuRasterizationForTesting() const { return m_match esHeuristicsForGpuRasterization; }
516 519
517 void setTopControlsHeight(float height, bool topControlsShrinkLayoutSize) ov erride; 520 void setTopControlsHeight(float height, bool topControlsShrinkLayoutSize) ov erride;
518 void updateTopControlsState(WebTopControlsState constraint, WebTopControlsSt ate current, bool animate) override; 521 void updateTopControlsState(WebTopControlsState constraint, WebTopControlsSt ate current, bool animate) override;
519 522
520 TopControls& topControls(); 523 TopControls& topControls();
521 // Called anytime top controls layout height or content offset have changed. 524 // Called anytime top controls layout height or content offset have changed.
522 void didUpdateTopControls(); 525 void didUpdateTopControls();
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 }; 772 };
770 773
771 DEFINE_TYPE_CASTS(WebViewImpl, WebWidget, widget, widget->isWebView(), widget.is WebView()); 774 DEFINE_TYPE_CASTS(WebViewImpl, WebWidget, widget, widget->isWebView(), widget.is WebView());
772 // We have no ways to check if the specified WebView is an instance of 775 // We have no ways to check if the specified WebView is an instance of
773 // WebViewImpl because WebViewImpl is the only implementation of WebView. 776 // WebViewImpl because WebViewImpl is the only implementation of WebView.
774 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); 777 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
775 778
776 } // namespace blink 779 } // namespace blink
777 780
778 #endif 781 #endif
OLDNEW
« no previous file with comments | « Source/core/paint/InlineTextBoxPainter.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698